mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fixes after function renaming

Browse source
This commit is contained in:
Martin Felke 2023-06-05 00:16:24 +02:00
commit 69f5df40f9
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/settings.cpp
View file

@ -257,8 +257,8 @@ void RestoreGlobalState(bool is_powered_on) {
// this function only makes sense with integrated devices // this function only makes sense with integrated devices
u64 RamPercentToByte(u8 percent) { u64 RamPercentToBytes(u8 percent) {
// total RAM in byte // total RAM in bytes
u64 total_ram = Common::GetMemInfo().TotalPhysicalMemory; u64 total_ram = Common::GetMemInfo().TotalPhysicalMemory;
// clamp percentage between 10 and 90, so we dont run out of either RAM or VRAM // clamp percentage between 10 and 90, so we dont run out of either RAM or VRAM

2
src/common/settings.h
View file

@ -615,6 +615,6 @@ void UpdateRescalingInfo();
// Restore the global state of all applicable settings in the Values struct // Restore the global state of all applicable settings in the Values struct
void RestoreGlobalState(bool is_powered_on); void RestoreGlobalState(bool is_powered_on);
u64 RAM_Percent_to_Byte(u8 percent); u64 RamPercentToBytes(u8 percent);
} // namespace Settings } // namespace Settings

2
src/video_core/renderer_opengl/gl_device.cpp
View file

@ -292,7 +292,7 @@ u64 Device::GetTotalDedicatedVideoMemory() const {
if (Settings::values.use_vram_percentage.GetValue()) { if (Settings::values.use_vram_percentage.GetValue()) {
u8 percent = Settings::values.vram_percentage.GetValue(); u8 percent = Settings::values.vram_percentage.GetValue();
return Settings::RamPercentToByte(percent); return Settings::RamPercentToBytes(percent);
} else { } else {
// this is according to both former settings in the gl_buffer_cache // this is according to both former settings in the gl_buffer_cache
// and gl_texture_cache, regarding device_access_memory // and gl_texture_cache, regarding device_access_memory

2
src/video_core/vulkan_common/vulkan_device.cpp
View file

@ -1042,7 +1042,7 @@ void Device::CollectPhysicalMemoryInfo() {
const u8 percent = Settings::values.vram_percentage.GetValue(); const u8 percent = Settings::values.vram_percentage.GetValue();
const s64 available_memory = static_cast<s64>(device_access_memory - device_initial_usage); const s64 available_memory = static_cast<s64>(device_access_memory - device_initial_usage);
const s64 limit = Settings::values.use_vram_percentage.GetValue() const s64 limit = Settings::values.use_vram_percentage.GetValue()
? Settings::RamPercentToByte(percent) ? Settings::RamPercentToBytes(percent)
: 4_GiB; : 4_GiB;
device_access_memory = static_cast<u64>(std::max<s64>( device_access_memory = static_cast<u64>(std::max<s64>(
std::min<s64>(available_memory - 8_GiB, 4_GiB), std::min<s64>(local_memory, limit))); std::min<s64>(available_memory - 8_GiB, 4_GiB), std::min<s64>(local_memory, limit)));