diff --git a/src/core/fullscreenui_settings.cpp b/src/core/fullscreenui_settings.cpp index fc3c7cad2..5c7eaabac 100644 --- a/src/core/fullscreenui_settings.cpp +++ b/src/core/fullscreenui_settings.cpp @@ -3883,12 +3883,6 @@ void FullscreenUI::DrawGraphicsSettingsPage() &Settings::GetLineDetectModeName, &Settings::GetLineDetectModeDisplayName, GPULineDetectMode::Count, resolution_scale > 1); - DrawEnumSetting(bsi, FSUI_ICONVSTR(ICON_FA_BOX, "Wireframe Rendering"), - FSUI_VSTR("Overlays or replaces normal triangle drawing with a wireframe/line view."), "GPU", - "WireframeMode", GPUWireframeMode::Disabled, &Settings::ParseGPUWireframeMode, - &Settings::GetGPUWireframeModeName, &Settings::GetGPUWireframeModeDisplayName, - GPUWireframeMode::Count); - DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_DROPLET_SLASH, "Scaled Interlacing"), FSUI_VSTR("Scales line skipping in interlaced rendering to the internal resolution, making it " "less noticeable. Usually safe to enable."), @@ -5005,6 +4999,12 @@ void FullscreenUI::DrawAdvancedSettingsPage() &Settings::ParseSaveStateCompressionModeName, &Settings::GetSaveStateCompressionModeName, &Settings::GetSaveStateCompressionModeDisplayName, SaveStateCompressionMode::Count); + DrawEnumSetting(bsi, FSUI_VSTR("Wireframe Rendering"), + FSUI_VSTR("Overlays or replaces normal triangle drawing with a wireframe/line view."), "GPU", + "WireframeMode", GPUWireframeMode::Disabled, &Settings::ParseGPUWireframeMode, + &Settings::GetGPUWireframeModeName, &Settings::GetGPUWireframeModeDisplayName, + GPUWireframeMode::Count); + MenuHeading(FSUI_VSTR("CPU Emulation")); DrawToggleSetting(bsi, FSUI_VSTR("Enable Recompiler Memory Exceptions"), diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index 494786222..931949a2a 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -150,10 +150,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* &Settings::ParseLineDetectModeName, &Settings::GetLineDetectModeName, &Settings::GetLineDetectModeDisplayName, Settings::DEFAULT_GPU_LINE_DETECT_MODE, GPULineDetectMode::Count); - SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.gpuWireframeMode, "GPU", "WireframeMode", - Settings::ParseGPUWireframeMode, Settings::GetGPUWireframeModeName, - &Settings::GetGPUWireframeModeDisplayName, - Settings::DEFAULT_GPU_WIREFRAME_MODE, GPUWireframeMode::Count); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gpuThread, "GPU", "UseThread", true); SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.maxQueuedFrames, "GPU", "MaxQueuedFrames", Settings::DEFAULT_GPU_MAX_QUEUED_FRAMES); @@ -349,6 +345,11 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* // Debugging Tab + SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.gpuWireframeMode, "GPU", "WireframeMode", + Settings::ParseGPUWireframeMode, Settings::GetGPUWireframeModeName, + &Settings::GetGPUWireframeModeDisplayName, + Settings::DEFAULT_GPU_WIREFRAME_MODE, GPUWireframeMode::Count); + SettingWidgetBinder::BindWidgetToEnumSetting( sif, m_ui.gpuDumpCompressionMode, "GPU", "DumpCompressionMode", &Settings::ParseGPUDumpCompressionMode, &Settings::GetGPUDumpCompressionModeName, &Settings::GetGPUDumpCompressionModeDisplayName, @@ -500,9 +501,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* m_ui.msaaMode, tr("Multi-Sampling"), tr("Disabled"), tr("Uses multi-sampled anti-aliasing when rendering 3D polygons. Can improve visuals with a lower performance " "requirement compared to upscaling, but often introduces rendering errors.")); - 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. Provides a significant speed improvement " "particularly with the software renderer, and is safe to use.")); @@ -681,6 +679,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* // Debugging Tab + 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.useDebugDevice, tr("Use Debug Device"), tr("Unchecked"), tr("Enable debugging when supported by the host's renderer API. Only for developer use.")); diff --git a/src/duckstation-qt/graphicssettingswidget.ui b/src/duckstation-qt/graphicssettingswidget.ui index 22794eada..fedd13cd1 100644 --- a/src/duckstation-qt/graphicssettingswidget.ui +++ b/src/duckstation-qt/graphicssettingswidget.ui @@ -316,7 +316,7 @@ Display Options - + @@ -391,7 +391,7 @@ Rendering Options - + @@ -412,17 +412,7 @@ - - - - Wireframe Mode: - - - - - - - + @@ -1447,12 +1437,31 @@ 0 + + + + Rendering Options + + + + + + Wireframe Mode: + + + + + + + + + GPU Dump Recording/Playback - +