Merge https://github.com/Moonlacer/yuzu

2021-08-06 20:47:54 -05:00 · 2021-08-06 20:47:15 -05:00 · 2021-08-06 19:48:03 -05:00 · 2021-08-06 19:45:36 -05:00 · 2021-08-06 18:48:29 -05:00 · 2021-08-06 18:47:00 -05:00
2 changed files with 12 additions and 12 deletions
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -23,11 +23,11 @@ ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default;
 void ConfigureGraphicsAdvanced::SetConfiguration() {
    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
    ui->use_vsync->setEnabled(runtime_lock);
-    ui->use_asynchronous_shaders->setEnabled(runtime_lock);
+    // ui->use_asynchronous_shaders->setEnabled(runtime_lock);
    ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);

    ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue());
-    ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());
+    // ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());
    ui->use_caches_gc->setChecked(Settings::values.use_caches_gc.GetValue());
    ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue());

@@ -52,9 +52,9 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {
    ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,
                                             ui->anisotropic_filtering_combobox);
    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, use_vsync);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
-                                             ui->use_asynchronous_shaders,
-                                             use_asynchronous_shaders);
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
+                                             // ui->use_asynchronous_shaders,
+                                             // use_asynchronous_shaders);
    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_caches_gc, ui->use_caches_gc,
                                             use_caches_gc);
    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
@@ -78,8 +78,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {
    if (Settings::IsConfiguringGlobal()) {
        ui->gpu_accuracy->setEnabled(Settings::values.gpu_accuracy.UsingGlobal());
        ui->use_vsync->setEnabled(Settings::values.use_vsync.UsingGlobal());
-        ui->use_asynchronous_shaders->setEnabled(
-            Settings::values.use_asynchronous_shaders.UsingGlobal());
+        // 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_caches_gc->setEnabled(Settings::values.use_caches_gc.UsingGlobal());
        ui->anisotropic_filtering_combobox->setEnabled(
@@ -89,9 +89,9 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {
    }

    ConfigurationShared::SetColoredTristate(ui->use_vsync, Settings::values.use_vsync, use_vsync);
-    ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders,
-                                            Settings::values.use_asynchronous_shaders,
-                                            use_asynchronous_shaders);
+    // ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders,
+                                            // Settings::values.use_asynchronous_shaders,
+                                            // use_asynchronous_shaders);
    ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time,
                                            Settings::values.use_fast_gpu_time, use_fast_gpu_time);
    ConfigurationShared::SetColoredTristate(ui->use_caches_gc, Settings::values.use_caches_gc,
--- a/src/yuzu/configuration/configure_graphics_advanced.ui
+++ b/src/yuzu/configuration/configure_graphics_advanced.ui
@@ -76,7 +76,7 @@
          </property>
         </widget>
        </item>
-        <item>
+        <!--<item>
         <widget class="QCheckBox" name="use_asynchronous_shaders">
          <property name="toolTip">
           <string>Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental.</string>
@@ -85,7 +85,7 @@
           <string>Use asynchronous shader building</string>
          </property>
         </widget>
-        </item>
+        </item>-->
        <item>
         <widget class="QCheckBox" name="use_fast_gpu_time">
          <property name="text">
Author	SHA1	Message	Date
Moonlacer	86628c7133	Merge https://github.com/Moonlacer/yuzu	2021-08-06 20:47:54 -05:00
Moonlacer	ddfc9c543d	Merge https://github.com/Moonlacer/yuzu	2021-08-06 20:47:15 -05:00
Moonlacer	df195b40ad	Merge https://github.com/Moonlacer/yuzu	2021-08-06 19:48:03 -05:00
Moonlacer	00bab69e90	Merge https://github.com/Moonlacer/yuzu	2021-08-06 19:45:36 -05:00
Moonlacer	a2e07a62b3	Merge https://github.com/Moonlacer/yuzu	2021-08-06 18:48:29 -05:00
Moonlacer	6040738fcc	Merge https://github.com/Moonlacer/yuzu	2021-08-06 18:47:00 -05:00
Moonlacer	4111bec9c5	Merge https://github.com/Moonlacer/yuzu	2021-08-06 18:31:11 -05:00
Moonlacer	33252d88dc	settings_ui:	2021-08-06 18:30:30 -05:00
Moonlacer	afd884ba94	settings_ui:	2021-08-06 18:08:57 -05:00