From b250b5251176b5b6c1a9daa5d35cc83dbb1332d2 Mon Sep 17 00:00:00 2001 From: Martin Felke Date: Sun, 4 Jun 2023 23:43:19 +0200 Subject: [PATCH] formatting fixes --- src/common/settings.cpp | 4 ++-- src/video_core/renderer_opengl/gl_device.cpp | 5 ++--- .../vulkan_common/vulkan_device.cpp | 4 +++- .../configure_graphics_advanced.cpp | 20 +++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6575769fe0..e004bcba03 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -6,8 +6,8 @@ #include "common/assert.h" #include "common/fs/path_util.h" #include "common/logging/log.h" -#include "common/settings.h" #include "common/memory_detect.h" +#include "common/settings.h" namespace Settings { @@ -257,7 +257,7 @@ void RestoreGlobalState(bool is_powered_on) { // this function only makes sense with integrated devices -u64 RAM_Percent_to_Byte(u8 percent) { +u64 RamPercentToByte(u8 percent) { // total RAM in byte u64 total_ram = Common::GetMemInfo().TotalPhysicalMemory; diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index b0f106bdfd..19293b3196 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -292,9 +292,8 @@ u64 Device::GetTotalDedicatedVideoMemory() const { if (Settings::values.use_vram_percentage.GetValue()) { u8 percent = Settings::values.vram_percentage.GetValue(); - return Settings::RAM_Percent_to_Byte(percent); - } - else { + return Settings::RamPercentToByte(percent); + } else { // this is according to both former settings in the gl_buffer_cache // and gl_texture_cache, regarding device_access_memory return static_cast(tot_avail_mem_kb) * 1_KiB + 512_MiB; diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 26a470982a..1b231cf141 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1041,7 +1041,9 @@ void Device::CollectPhysicalMemoryInfo() { } const u8 percent = Settings::values.vram_percentage.GetValue(); const s64 available_memory = static_cast(device_access_memory - device_initial_usage); - const s64 limit = Settings::values.use_vram_percentage.GetValue() ? Settings::RAM_Percent_to_Byte(percent) : 4_GiB; + const s64 limit = Settings::values.use_vram_percentage.GetValue() + ? Settings::RamPercentToByte(percent) + : 4_GiB; device_access_memory = static_cast(std::max( std::min(available_memory - 8_GiB, 4_GiB), std::min(local_memory, limit))); } diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 39472dbc82..37afdb04c9 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -46,15 +46,16 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->use_vram_percentage->setChecked(Settings::values.use_vram_percentage.GetValue()); if (Settings::IsConfiguringGlobal()) { - ui->vram_percentage->setEnabled(Settings::values.use_vram_percentage.GetValue() && runtime_lock); - } else { ui->vram_percentage->setEnabled(Settings::values.use_vram_percentage.GetValue() && - use_vram_percentage != ConfigurationShared::CheckState::Global && runtime_lock); + runtime_lock); + } else { + ui->vram_percentage->setEnabled( + Settings::values.use_vram_percentage.GetValue() && + use_vram_percentage != ConfigurationShared::CheckState::Global && runtime_lock); } ui->vram_percentage->setValue(Settings::values.vram_percentage.GetValue()); - if (Settings::IsConfiguringGlobal()) { ui->gpu_accuracy->setCurrentIndex( static_cast(Settings::values.gpu_accuracy.GetValue())); @@ -74,7 +75,8 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { !Settings::values.max_anisotropy.UsingGlobal()); ConfigurationShared::SetHighlight(ui->label_astc_recompression, !Settings::values.astc_recompression.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->vram_percentage, !Settings::values.vram_percentage.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->vram_percentage, + !Settings::values.vram_percentage.UsingGlobal()); } } @@ -105,8 +107,7 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { ui->enable_compute_pipelines_checkbox, enable_compute_pipelines); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vram_percentage, - ui->use_vram_percentage, - use_vram_percentage); + ui->use_vram_percentage, use_vram_percentage); Settings::values.vram_percentage.SetValue(ui->vram_percentage->value()); } @@ -175,9 +176,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ConfigurationShared::SetColoredComboBox( ui->astc_recompression_combobox, ui->label_astc_recompression, static_cast(Settings::values.astc_recompression.GetValue(true))); - ConfigurationShared::SetColoredTristate(ui->use_vram_percentage, - Settings::values.use_vram_percentage, - use_vram_percentage); + ConfigurationShared::SetColoredTristate( + ui->use_vram_percentage, Settings::values.use_vram_percentage, use_vram_percentage); connect(ui->use_vram_percentage, &QCheckBox::clicked, ui->vram_percentage, [this]() { ui->vram_percentage->setEnabled(ui->use_vram_percentage->isChecked() &&