Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Increased the minimum VRAM limit from 80 MiB to 128 MiB.

Browse source
This commit is contained in:
Leon Styhre 2022-09-27 17:43:27 +02:00
parent 9d1c352968
commit 15e30bc0ca
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-app/src/guis/GuiMenu.cpp
View file

@ -780,7 +780,7 @@ void GuiMenu::openSoundOptions()
VolumeControl volumeControl; VolumeControl volumeControl;
int currentVolume {volumeControl.getVolume()}; int currentVolume {volumeControl.getVolume()};
auto systemVolume = std::make_shared<SliderComponent>(0.f, 100.f, 1.f, "%"); auto systemVolume = std::make_shared<SliderComponent>(0.0f, 100.0f, 1.0f, "%");
systemVolume->setValue(static_cast<float>(currentVolume)); systemVolume->setValue(static_cast<float>(currentVolume));
s->addWithLabel("SYSTEM VOLUME", systemVolume); s->addWithLabel("SYSTEM VOLUME", systemVolume);
s->addSaveFunc([systemVolume, currentVolume] { s->addSaveFunc([systemVolume, currentVolume] {
@ -793,7 +793,7 @@ void GuiMenu::openSoundOptions()
#endif #endif
// Volume for navigation sounds. // Volume for navigation sounds.
auto soundVolumeNavigation = std::make_shared<SliderComponent>(0.f, 100.f, 1.f, "%"); auto soundVolumeNavigation = std::make_shared<SliderComponent>(0.0f, 100.0f, 1.0f, "%");
soundVolumeNavigation->setValue( soundVolumeNavigation->setValue(
static_cast<float>(Settings::getInstance()->getInt("SoundVolumeNavigation"))); static_cast<float>(Settings::getInstance()->getInt("SoundVolumeNavigation")));
s->addWithLabel("NAVIGATION SOUNDS VOLUME", soundVolumeNavigation); s->addWithLabel("NAVIGATION SOUNDS VOLUME", soundVolumeNavigation);
@ -807,7 +807,7 @@ void GuiMenu::openSoundOptions()
}); });
// Volume for videos. // Volume for videos.
auto soundVolumeVideos = std::make_shared<SliderComponent>(0.f, 100.f, 1.f, "%"); auto soundVolumeVideos = std::make_shared<SliderComponent>(0.0f, 100.0f, 1.0f, "%");
soundVolumeVideos->setValue( soundVolumeVideos->setValue(
static_cast<float>(Settings::getInstance()->getInt("SoundVolumeVideos"))); static_cast<float>(Settings::getInstance()->getInt("SoundVolumeVideos")));
s->addWithLabel("VIDEO PLAYER VOLUME", soundVolumeVideos); s->addWithLabel("VIDEO PLAYER VOLUME", soundVolumeVideos);
@ -1023,7 +1023,7 @@ void GuiMenu::openOtherOptions()
s->addRow(rowMediaDir); s->addRow(rowMediaDir);
// Maximum VRAM. // Maximum VRAM.
auto maxVram = std::make_shared<SliderComponent>(80.f, 1024.f, 8.f, "MiB"); auto maxVram = std::make_shared<SliderComponent>(128.0f, 1024.0f, 8.0f, "MiB");
maxVram->setValue(static_cast<float>(Settings::getInstance()->getInt("MaxVRAM"))); maxVram->setValue(static_cast<float>(Settings::getInstance()->getInt("MaxVRAM")));
s->addWithLabel("VRAM LIMIT", maxVram); s->addWithLabel("VRAM LIMIT", maxVram);
s->addSaveFunc([maxVram, s] { s->addSaveFunc([maxVram, s] {

8
es-core/src/resources/TextureDataManager.cpp
View file

@ -117,11 +117,11 @@ void TextureDataManager::load(std::shared_ptr<TextureData> tex, bool block)
size_t size {TextureResource::getTotalMemUsage()}; size_t size {TextureResource::getTotalMemUsage()};
size_t settingVRAM {static_cast<size_t>(Settings::getInstance()->getInt("MaxVRAM"))}; size_t settingVRAM {static_cast<size_t>(Settings::getInstance()->getInt("MaxVRAM"))};
if (settingVRAM < 80) { if (settingVRAM < 128) {
LOG(LogWarning) << "MaxVRAM is too low at " << settingVRAM LOG(LogWarning) << "MaxVRAM is too low at " << settingVRAM
<< " MiB, setting it to the minimum allowed value of 80 MiB"; << " MiB, setting it to the minimum allowed value of 128 MiB";
Settings::getInstance()->setInt("MaxVRAM", 80); Settings::getInstance()->setInt("MaxVRAM", 128);
settingVRAM = 80; settingVRAM = 128;
} }
else if (settingVRAM > 1024) { else if (settingVRAM > 1024) {
LOG(LogWarning) << "MaxVRAM is too high at " << settingVRAM LOG(LogWarning) << "MaxVRAM is too high at " << settingVRAM