summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Liam2023-05-03 18:51:44 -0400
committerGravatar Liam2023-05-03 18:52:42 -0400
commitae59ffc56c6e93f603a6cfc3efec02de93c3c19b (patch)
tree838abe951e359c230896f6498692c44de00d3bc1
parentMerge pull request #10088 from FernandoS27/100-gelato-flavor-test-builds-later (diff)
downloadyuzu-ae59ffc56c6e93f603a6cfc3efec02de93c3c19b.tar.gz
yuzu-ae59ffc56c6e93f603a6cfc3efec02de93c3c19b.tar.xz
yuzu-ae59ffc56c6e93f603a6cfc3efec02de93c3c19b.zip
settings: remove pessimistic flushing
-rw-r--r--src/common/settings.cpp1
-rw-r--r--src/common/settings.h1
-rw-r--r--src/yuzu/configuration/config.cpp2
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.cpp8
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.h1
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.ui10
-rw-r--r--src/yuzu_cmd/config.cpp1
-rw-r--r--src/yuzu_cmd/default_ini.h4
8 files changed, 0 insertions, 28 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index cb1bca467..174460c5e 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -227,7 +227,6 @@ void RestoreGlobalState(bool is_powered_on) {
227 values.shader_backend.SetGlobal(true); 227 values.shader_backend.SetGlobal(true);
228 values.use_asynchronous_shaders.SetGlobal(true); 228 values.use_asynchronous_shaders.SetGlobal(true);
229 values.use_fast_gpu_time.SetGlobal(true); 229 values.use_fast_gpu_time.SetGlobal(true);
230 values.use_pessimistic_flushes.SetGlobal(true);
231 values.use_vulkan_driver_pipeline_cache.SetGlobal(true); 230 values.use_vulkan_driver_pipeline_cache.SetGlobal(true);
232 values.bg_red.SetGlobal(true); 231 values.bg_red.SetGlobal(true);
233 values.bg_green.SetGlobal(true); 232 values.bg_green.SetGlobal(true);
diff --git a/src/common/settings.h b/src/common/settings.h
index adebb0ca7..55200c36f 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -461,7 +461,6 @@ struct Values {
461 ShaderBackend::SPIRV, "shader_backend"}; 461 ShaderBackend::SPIRV, "shader_backend"};
462 SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"}; 462 SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"};
463 SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"}; 463 SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"};
464 SwitchableSetting<bool> use_pessimistic_flushes{false, "use_pessimistic_flushes"};
465 SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true, 464 SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true,
466 "use_vulkan_driver_pipeline_cache"}; 465 "use_vulkan_driver_pipeline_cache"};
467 466
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index be33e4d79..0131f63e7 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -713,7 +713,6 @@ void Config::ReadRendererValues() {
713 ReadGlobalSetting(Settings::values.shader_backend); 713 ReadGlobalSetting(Settings::values.shader_backend);
714 ReadGlobalSetting(Settings::values.use_asynchronous_shaders); 714 ReadGlobalSetting(Settings::values.use_asynchronous_shaders);
715 ReadGlobalSetting(Settings::values.use_fast_gpu_time); 715 ReadGlobalSetting(Settings::values.use_fast_gpu_time);
716 ReadGlobalSetting(Settings::values.use_pessimistic_flushes);
717 ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); 716 ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);
718 ReadGlobalSetting(Settings::values.bg_red); 717 ReadGlobalSetting(Settings::values.bg_red);
719 ReadGlobalSetting(Settings::values.bg_green); 718 ReadGlobalSetting(Settings::values.bg_green);
@@ -1359,7 +1358,6 @@ void Config::SaveRendererValues() {
1359 Settings::values.shader_backend.UsingGlobal()); 1358 Settings::values.shader_backend.UsingGlobal());
1360 WriteGlobalSetting(Settings::values.use_asynchronous_shaders); 1359 WriteGlobalSetting(Settings::values.use_asynchronous_shaders);
1361 WriteGlobalSetting(Settings::values.use_fast_gpu_time); 1360 WriteGlobalSetting(Settings::values.use_fast_gpu_time);
1362 WriteGlobalSetting(Settings::values.use_pessimistic_flushes);
1363 WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); 1361 WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);
1364 WriteGlobalSetting(Settings::values.bg_red); 1362 WriteGlobalSetting(Settings::values.bg_red);
1365 WriteGlobalSetting(Settings::values.bg_green); 1363 WriteGlobalSetting(Settings::values.bg_green);
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 7f7bf0e4d..ddda79983 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -34,7 +34,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
34 ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); 34 ui->async_astc->setChecked(Settings::values.async_astc.GetValue());
35 ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); 35 ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());
36 ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); 36 ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue());
37 ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue());
38 ui->use_vulkan_driver_pipeline_cache->setChecked( 37 ui->use_vulkan_driver_pipeline_cache->setChecked(
39 Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); 38 Settings::values.use_vulkan_driver_pipeline_cache.GetValue());
40 39
@@ -71,8 +70,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {
71 use_asynchronous_shaders); 70 use_asynchronous_shaders);
72 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, 71 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
73 ui->use_fast_gpu_time, use_fast_gpu_time); 72 ui->use_fast_gpu_time, use_fast_gpu_time);
74 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_pessimistic_flushes,
75 ui->use_pessimistic_flushes, use_pessimistic_flushes);
76 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache, 73 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache,
77 ui->use_vulkan_driver_pipeline_cache, 74 ui->use_vulkan_driver_pipeline_cache,
78 use_vulkan_driver_pipeline_cache); 75 use_vulkan_driver_pipeline_cache);
@@ -102,8 +99,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {
102 ui->use_asynchronous_shaders->setEnabled( 99 ui->use_asynchronous_shaders->setEnabled(
103 Settings::values.use_asynchronous_shaders.UsingGlobal()); 100 Settings::values.use_asynchronous_shaders.UsingGlobal());
104 ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); 101 ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal());
105 ui->use_pessimistic_flushes->setEnabled(
106 Settings::values.use_pessimistic_flushes.UsingGlobal());
107 ui->use_vulkan_driver_pipeline_cache->setEnabled( 102 ui->use_vulkan_driver_pipeline_cache->setEnabled(
108 Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal()); 103 Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal());
109 ui->anisotropic_filtering_combobox->setEnabled( 104 ui->anisotropic_filtering_combobox->setEnabled(
@@ -125,9 +120,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {
125 use_asynchronous_shaders); 120 use_asynchronous_shaders);
126 ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, 121 ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time,
127 Settings::values.use_fast_gpu_time, use_fast_gpu_time); 122 Settings::values.use_fast_gpu_time, use_fast_gpu_time);
128 ConfigurationShared::SetColoredTristate(ui->use_pessimistic_flushes,
129 Settings::values.use_pessimistic_flushes,
130 use_pessimistic_flushes);
131 ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache, 123 ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache,
132 Settings::values.use_vulkan_driver_pipeline_cache, 124 Settings::values.use_vulkan_driver_pipeline_cache,
133 use_vulkan_driver_pipeline_cache); 125 use_vulkan_driver_pipeline_cache);
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index 5394ed40a..ff5060957 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -42,7 +42,6 @@ private:
42 ConfigurationShared::CheckState async_astc; 42 ConfigurationShared::CheckState async_astc;
43 ConfigurationShared::CheckState use_asynchronous_shaders; 43 ConfigurationShared::CheckState use_asynchronous_shaders;
44 ConfigurationShared::CheckState use_fast_gpu_time; 44 ConfigurationShared::CheckState use_fast_gpu_time;
45 ConfigurationShared::CheckState use_pessimistic_flushes;
46 ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; 45 ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache;
47 46
48 const Core::System& system; 47 const Core::System& system;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui
index d7ec18939..1234f695c 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.ui
+++ b/src/yuzu/configuration/configure_graphics_advanced.ui
@@ -127,16 +127,6 @@
127 </widget> 127 </widget>
128 </item> 128 </item>
129 <item> 129 <item>
130 <widget class="QCheckBox" name="use_pessimistic_flushes">
131 <property name="toolTip">
132 <string>Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance.</string>
133 </property>
134 <property name="text">
135 <string>Use pessimistic buffer flushes (Hack)</string>
136 </property>
137 </widget>
138 </item>
139 <item>
140 <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache"> 130 <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache">
141 <property name="toolTip"> 131 <property name="toolTip">
142 <string>Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally.</string> 132 <string>Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally.</string>
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index e4f91d07c..605280949 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -327,7 +327,6 @@ void Config::ReadValues() {
327 ReadSetting("Renderer", Settings::values.accelerate_astc); 327 ReadSetting("Renderer", Settings::values.accelerate_astc);
328 ReadSetting("Renderer", Settings::values.async_astc); 328 ReadSetting("Renderer", Settings::values.async_astc);
329 ReadSetting("Renderer", Settings::values.use_fast_gpu_time); 329 ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
330 ReadSetting("Renderer", Settings::values.use_pessimistic_flushes);
331 ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); 330 ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);
332 331
333 ReadSetting("Renderer", Settings::values.bg_red); 332 ReadSetting("Renderer", Settings::values.bg_red);
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index f714eae17..db6fba922 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -374,10 +374,6 @@ use_asynchronous_gpu_emulation =
374# 0: Off, 1 (default): On 374# 0: Off, 1 (default): On
375use_fast_gpu_time = 375use_fast_gpu_time =
376 376
377# Force unmodified buffers to be flushed, which can cost performance.
378# 0: Off (default), 1: On
379use_pessimistic_flushes =
380
381# Whether to use garbage collection or not for GPU caches. 377# Whether to use garbage collection or not for GPU caches.
382# 0 (default): Off, 1: On 378# 0 (default): Off, 1: On
383use_caches_gc = 379use_caches_gc =