Qt: Move threaded rendering toggle to Debug tab

Frees up some space.

src/core/fullscreen_ui.cpp

@@ -4449,30 +4449,15 @@ void FullscreenUI::DrawDisplaySettingsPage()
               "Usually results in worse frame pacing."),
     "Display", "DisableMailboxPresentation", false);
 
-  switch (renderer)
-  {
 #ifdef _WIN32
-    case GPURenderer::HardwareD3D11:
+  if (renderer == GPURenderer::HardwareD3D11 || renderer == GPURenderer::Software)
-    {
+  {
-      DrawToggleSetting(
+    DrawToggleSetting(
-        bsi, FSUI_CSTR("Use Blit Swap Chain"),
+      bsi, FSUI_CSTR("Use Blit Swap Chain"),
-        FSUI_CSTR("Uses a blit presentation model instead of flipping. This may be needed on some systems."), "Display",
+      FSUI_CSTR("Uses a blit presentation model instead of flipping. This may be needed on some systems."), "Display",
-        "UseBlitSwapChain", false);
+      "UseBlitSwapChain", false);
-    }
-    break;
-#endif
-
-    case GPURenderer::Software:
-    {
-      DrawToggleSetting(bsi, FSUI_CSTR("Threaded Rendering"),
-                        FSUI_CSTR("Uses a second thread for drawing graphics. Speed boost, and safe to use."), "GPU",
-                        "UseThread", true);
-    }
-    break;
-
-    default:
-      break;
   }
+#endif
 
   if (is_hardware && pgxp_enabled)
   {
@@ -5187,6 +5172,9 @@ void FullscreenUI::DrawAdvancedSettingsPage()
   DrawToggleSetting(bsi, FSUI_CSTR("Show Enhancement Settings"),
                     FSUI_CSTR("Shows enhancement settings in the bottom-right corner of the screen."), "Display",
                     "ShowEnhancements", false);
+  DrawToggleSetting(bsi, FSUI_CSTR("Threaded Rendering"),
+                    FSUI_CSTR("Uses a second thread for drawing graphics. Speed boost, and safe to use."), "GPU",
+                    "UseThread", true);
   DrawEnumSetting(bsi, FSUI_CSTR("Wireframe Rendering"),
                   FSUI_CSTR("Overlays or replaces normal triangle drawing with a wireframe/line view."), "GPU",
                   "WireframeMode", GPUWireframeMode::Disabled, &Settings::ParseGPUWireframeMode,

src/duckstation-qt/graphicssettingswidget.cpp

@@ -118,7 +118,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
   SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.displayRotation, "Display", "Rotation",
                                                &Settings::ParseDisplayRotation, &Settings::GetDisplayRotationName,
                                                Settings::DEFAULT_DISPLAY_ROTATION);
-  SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gpuThread, "GPU", "UseThread", true);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disableMailboxPresentation, "Display",
                                                "DisableMailboxPresentation", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.stretchDisplayVertically, "Display", "StretchVertically",
@@ -256,6 +255,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
 
   // Debugging Tab
 
+  SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gpuThread, "GPU", "UseThread", true);
+
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.useDebugDevice, "GPU", "UseDebugDevice", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disableShaderCache, "GPU", "DisableShaderCache", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disableDualSource, "GPU", "DisableDualSourceBlend", false);
@@ -371,9 +372,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
     m_ui.displayAlignment, tr("Position"),
     QString::fromUtf8(Settings::GetDisplayAlignmentDisplayName(Settings::DEFAULT_DISPLAY_ALIGNMENT)),
     tr("Determines the position on the screen when black borders must be added."));
-  dialog->registerWidgetHelp(m_ui.gpuThread, tr("Threaded Rendering"), tr("Checked"),
-                             tr("Uses a second thread for drawing graphics. Currently only available for the software "
-                                "renderer, but can provide a significant speed improvement, and is safe to use."));
   dialog->registerWidgetHelp(
     m_ui.disableMailboxPresentation, tr("Disable Mailbox Presentation"), tr("Unchecked"),
     tr("Forces the use of FIFO over Mailbox presentation, i.e. double buffering instead of triple buffering. "
@@ -559,6 +557,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
   dialog->registerWidgetHelp(m_ui.gpuWireframeMode, tr("Wireframe Mode"), tr("Disabled"),
                              tr("Draws a wireframe outline of the triangles rendered by the console's GPU, either as a "
                                 "replacement or an overlay."));
+  dialog->registerWidgetHelp(m_ui.gpuThread, tr("Threaded Rendering"), tr("Checked"),
+                             tr("Uses a second thread for drawing graphics. Currently only available for the software "
+                                "renderer, but can provide a significant speed improvement, and is safe to use."));
 
   dialog->registerWidgetHelp(
     m_ui.useDebugDevice, tr("Use Debug Device"), tr("Unchecked"),

src/duckstation-qt/graphicssettingswidget.ui

@@ -405,13 +405,6 @@
           </item>
           <item row="2" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout_5">
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="gpuThread">
-              <property name="text">
-               <string>Threaded Rendering</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="QCheckBox" name="scaledDithering">
               <property name="text">
@@ -433,7 +426,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="1" column="1">
              <widget class="QCheckBox" name="useSoftwareRendererForReadbacks">
               <property name="text">
                <string>Software Renderer Readbacks</string>
@@ -1223,6 +1216,17 @@
           <item row="0" column="1">
            <widget class="QComboBox" name="gpuWireframeMode"/>
           </item>
+          <item row="1" column="0" colspan="2">
+           <layout class="QGridLayout" name="gridLayout_4">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="gpuThread">
+              <property name="text">
+               <string>Threaded Rendering</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>