VERY experimental Nintendo Switch 2 emulator
C++
common: add setting for renderer clock workaround
Liamd9b2bc7f045e
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 149e621f9c..34083e8af8 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -185,6 +185,7 @@ void RestoreGlobalState(bool is_powered_on) {// Renderervalues.fsr_sharpening_slider.SetGlobal(true);values.renderer_backend.SetGlobal(true);+ values.renderer_force_max_clock.SetGlobal(true);values.vulkan_device.SetGlobal(true);values.aspect_ratio.SetGlobal(true);values.max_anisotropy.SetGlobal(true);diff --git a/src/common/settings.h b/src/common/settings.hindex 5017951c53..cf6895fb3d 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -415,6 +415,7 @@ struct Values {// RendererSwitchableSetting<RendererBackend, true> renderer_backend{RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null, "backend"};+ SwitchableSetting<bool> renderer_force_max_clock{true, "force_max_clock"};Setting<bool> renderer_debug{false, "debug"};Setting<bool> renderer_shader_feedback{false, "shader_feedback"};Setting<bool> enable_nsight_aftermath{false, "nsight_aftermath"};diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cppindex e5802b40cf..2f3d1c934f 100644--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp@@ -110,7 +110,9 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_,screen_info),rasterizer(render_window, gpu, cpu_memory, screen_info, device, memory_allocator,state_tracker, scheduler) {- turbo_mode.emplace(instance, dld);+ if (Settings::values.renderer_force_max_clock.GetValue()) {+ turbo_mode.emplace(instance, dld);+ }Report();} catch (const vk::Exception& exception) {LOG_ERROR(Render_Vulkan, "Vulkan initialization failed with error: {}", exception.what());diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex e9425b5bdb..dfc745016b 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -690,6 +690,7 @@ void Config::ReadRendererValues() {qt_config->beginGroup(QStringLiteral("Renderer"));ReadGlobalSetting(Settings::values.renderer_backend);+ ReadGlobalSetting(Settings::values.renderer_force_max_clock);ReadGlobalSetting(Settings::values.vulkan_device);ReadGlobalSetting(Settings::values.fullscreen_mode);ReadGlobalSetting(Settings::values.aspect_ratio);@@ -1305,6 +1306,9 @@ void Config::SaveRendererValues() {static_cast<u32>(Settings::values.renderer_backend.GetValue(global)),static_cast<u32>(Settings::values.renderer_backend.GetDefault()),Settings::values.renderer_backend.UsingGlobal());+ WriteSetting(QString::fromStdString(Settings::values.renderer_force_max_clock.GetLabel()),+ static_cast<u32>(Settings::values.renderer_force_max_clock.GetValue(global)),+ static_cast<u32>(Settings::values.renderer_force_max_clock.GetDefault()));WriteGlobalSetting(Settings::values.vulkan_device);WriteSetting(QString::fromStdString(Settings::values.fullscreen_mode.GetLabel()),static_cast<u32>(Settings::values.fullscreen_mode.GetValue(global)),diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cppindex 01f074699c..60ecc7e3e2 100644--- a/src/yuzu/configuration/configure_graphics_advanced.cpp+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp@@ -25,6 +25,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {ui->use_asynchronous_shaders->setEnabled(runtime_lock);ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);+ ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue());ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue());ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue());@@ -37,6 +38,8 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {Settings::values.max_anisotropy.GetValue());} else {ConfigurationShared::SetPerGameSetting(ui->gpu_accuracy, &Settings::values.gpu_accuracy);+ ConfigurationShared::SetPerGameSetting(ui->renderer_force_max_clock,+ &Settings::values.renderer_force_max_clock);ConfigurationShared::SetPerGameSetting(ui->anisotropic_filtering_combobox,&Settings::values.max_anisotropy);ConfigurationShared::SetHighlight(ui->label_gpu_accuracy,@@ -48,6 +51,9 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {void ConfigureGraphicsAdvanced::ApplyConfiguration() {ConfigurationShared::ApplyPerGameSetting(&Settings::values.gpu_accuracy, ui->gpu_accuracy);+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.renderer_force_max_clock,+ ui->renderer_force_max_clock,+ renderer_force_max_clock);ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,ui->anisotropic_filtering_combobox);ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, use_vsync);@@ -76,6 +82,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {// Disable if not global (only happens during game)if (Settings::IsConfiguringGlobal()) {ui->gpu_accuracy->setEnabled(Settings::values.gpu_accuracy.UsingGlobal());+ ui->renderer_force_max_clock->setEnabled(+ Settings::values.renderer_force_max_clock.UsingGlobal());ui->use_vsync->setEnabled(Settings::values.use_vsync.UsingGlobal());ui->use_asynchronous_shaders->setEnabled(Settings::values.use_asynchronous_shaders.UsingGlobal());@@ -88,6 +96,9 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {return;}+ ConfigurationShared::SetColoredTristate(ui->renderer_force_max_clock,+ Settings::values.renderer_force_max_clock,+ renderer_force_max_clock);ConfigurationShared::SetColoredTristate(ui->use_vsync, Settings::values.use_vsync, use_vsync);ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders,Settings::values.use_asynchronous_shaders,diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.hindex 12e816905a..5b53bcc719 100644--- a/src/yuzu/configuration/configure_graphics_advanced.h+++ b/src/yuzu/configuration/configure_graphics_advanced.h@@ -36,6 +36,7 @@ private:std::unique_ptr<Ui::ConfigureGraphicsAdvanced> ui;+ ConfigurationShared::CheckState renderer_force_max_clock;ConfigurationShared::CheckState use_vsync;ConfigurationShared::CheckState use_asynchronous_shaders;ConfigurationShared::CheckState use_fast_gpu_time;diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.uiindex 87a1214710..1181e35623 100644--- a/src/yuzu/configuration/configure_graphics_advanced.ui+++ b/src/yuzu/configuration/configure_graphics_advanced.ui@@ -69,6 +69,16 @@</layout></widget></item>+ <item>+ <widget class="QCheckBox" name="renderer_force_max_clock">+ <property name="toolTip">+ <string>Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed.</string>+ </property>+ <property name="text">+ <string>Force maximum clocks (Vulkan only)</string>+ </property>+ </widget>+ </item><item><widget class="QCheckBox" name="use_vsync"><property name="toolTip">diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex 1e45e57bcf..23478e8a65 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -296,6 +296,7 @@ void Config::ReadValues() {// RendererReadSetting("Renderer", Settings::values.renderer_backend);+ ReadSetting("Renderer", Settings::values.renderer_force_max_clock);ReadSetting("Renderer", Settings::values.renderer_debug);ReadSetting("Renderer", Settings::values.renderer_shader_feedback);ReadSetting("Renderer", Settings::values.enable_nsight_aftermath);