VERY experimental Nintendo Switch 2 emulator
C++
settings: remove pessimistic flushing
Liamf50b8635b3ba
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex cb1bca4675..174460c5ed 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -227,7 +227,6 @@ void RestoreGlobalState(bool is_powered_on) {values.shader_backend.SetGlobal(true);values.use_asynchronous_shaders.SetGlobal(true);values.use_fast_gpu_time.SetGlobal(true);- values.use_pessimistic_flushes.SetGlobal(true);values.use_vulkan_driver_pipeline_cache.SetGlobal(true);values.bg_red.SetGlobal(true);values.bg_green.SetGlobal(true);diff --git a/src/common/settings.h b/src/common/settings.hindex adebb0ca7c..55200c36fc 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -461,7 +461,6 @@ struct Values {ShaderBackend::SPIRV, "shader_backend"};SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"};SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"};- SwitchableSetting<bool> use_pessimistic_flushes{false, "use_pessimistic_flushes"};SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true,"use_vulkan_driver_pipeline_cache"};diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex be33e4d79c..0131f63e72 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -713,7 +713,6 @@ void Config::ReadRendererValues() {ReadGlobalSetting(Settings::values.shader_backend);ReadGlobalSetting(Settings::values.use_asynchronous_shaders);ReadGlobalSetting(Settings::values.use_fast_gpu_time);- ReadGlobalSetting(Settings::values.use_pessimistic_flushes);ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);ReadGlobalSetting(Settings::values.bg_red);ReadGlobalSetting(Settings::values.bg_green);@@ -1359,7 +1358,6 @@ void Config::SaveRendererValues() {Settings::values.shader_backend.UsingGlobal());WriteGlobalSetting(Settings::values.use_asynchronous_shaders);WriteGlobalSetting(Settings::values.use_fast_gpu_time);- WriteGlobalSetting(Settings::values.use_pessimistic_flushes);WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);WriteGlobalSetting(Settings::values.bg_red);WriteGlobalSetting(Settings::values.bg_green);diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cppindex 7f7bf0e4d0..ddda799833 100644--- a/src/yuzu/configuration/configure_graphics_advanced.cpp+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp@@ -34,7 +34,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {ui->async_astc->setChecked(Settings::values.async_astc.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());- ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue());ui->use_vulkan_driver_pipeline_cache->setChecked(Settings::values.use_vulkan_driver_pipeline_cache.GetValue());@@ -71,8 +70,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {use_asynchronous_shaders);ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,ui->use_fast_gpu_time, use_fast_gpu_time);- ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_pessimistic_flushes,- ui->use_pessimistic_flushes, use_pessimistic_flushes);ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache,ui->use_vulkan_driver_pipeline_cache,use_vulkan_driver_pipeline_cache);@@ -102,8 +99,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {ui->use_asynchronous_shaders->setEnabled(Settings::values.use_asynchronous_shaders.UsingGlobal());ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal());- ui->use_pessimistic_flushes->setEnabled(- Settings::values.use_pessimistic_flushes.UsingGlobal());ui->use_vulkan_driver_pipeline_cache->setEnabled(Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal());ui->anisotropic_filtering_combobox->setEnabled(@@ -125,9 +120,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {use_asynchronous_shaders);ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time,Settings::values.use_fast_gpu_time, use_fast_gpu_time);- ConfigurationShared::SetColoredTristate(ui->use_pessimistic_flushes,- Settings::values.use_pessimistic_flushes,- use_pessimistic_flushes);ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache,Settings::values.use_vulkan_driver_pipeline_cache,use_vulkan_driver_pipeline_cache);diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.hindex 5394ed40aa..ff50609575 100644--- a/src/yuzu/configuration/configure_graphics_advanced.h+++ b/src/yuzu/configuration/configure_graphics_advanced.h@@ -42,7 +42,6 @@ private:ConfigurationShared::CheckState async_astc;ConfigurationShared::CheckState use_asynchronous_shaders;ConfigurationShared::CheckState use_fast_gpu_time;- ConfigurationShared::CheckState use_pessimistic_flushes;ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache;const Core::System& system;diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.uiindex d7ec189395..1234f695ca 100644--- a/src/yuzu/configuration/configure_graphics_advanced.ui+++ b/src/yuzu/configuration/configure_graphics_advanced.ui@@ -126,16 +126,6 @@</property></widget></item>- <item>- <widget class="QCheckBox" name="use_pessimistic_flushes">- <property name="toolTip">- <string>Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance.</string>- </property>- <property name="text">- <string>Use pessimistic buffer flushes (Hack)</string>- </property>- </widget>- </item><item><widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache"><property name="toolTip">diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex e4f91d07cf..6052809490 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -327,7 +327,6 @@ void Config::ReadValues() {ReadSetting("Renderer", Settings::values.accelerate_astc);ReadSetting("Renderer", Settings::values.async_astc);ReadSetting("Renderer", Settings::values.use_fast_gpu_time);- ReadSetting("Renderer", Settings::values.use_pessimistic_flushes);ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);ReadSetting("Renderer", Settings::values.bg_red);diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.hindex f714eae17e..db6fba9222 100644--- a/src/yuzu_cmd/default_ini.h+++ b/src/yuzu_cmd/default_ini.h@@ -374,10 +374,6 @@ use_asynchronous_gpu_emulation =# 0: Off, 1 (default): Onuse_fast_gpu_time =-# Force unmodified buffers to be flushed, which can cost performance.-# 0: Off (default), 1: On-use_pessimistic_flushes =-# Whether to use garbage collection or not for GPU caches.# 0 (default): Off, 1: Onuse_caches_gc =