Skip to content

Commit ed531da

Browse files
stenzekstenzek
committed
Qt: Move wireframe rendering to debug tab
Free up space in advanced.
1 parent 9eaf586 commit ed531da

File tree

3 files changed

+37
-27
lines changed

3 files changed

+37
-27
lines changed

‎src/core/fullscreenui_settings.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3883,12 +3883,6 @@ void FullscreenUI::DrawGraphicsSettingsPage()
38833883
&Settings::GetLineDetectModeName, &Settings::GetLineDetectModeDisplayName, GPULineDetectMode::Count,
38843884
resolution_scale > 1);
38853885

3886-
DrawEnumSetting(bsi, FSUI_ICONVSTR(ICON_FA_BOX, "Wireframe Rendering"),
3887-
FSUI_VSTR("Overlays or replaces normal triangle drawing with a wireframe/line view."), "GPU",
3888-
"WireframeMode", GPUWireframeMode::Disabled, &Settings::ParseGPUWireframeMode,
3889-
&Settings::GetGPUWireframeModeName, &Settings::GetGPUWireframeModeDisplayName,
3890-
GPUWireframeMode::Count);
3891-
38923886
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_DROPLET_SLASH, "Scaled Interlacing"),
38933887
FSUI_VSTR("Scales line skipping in interlaced rendering to the internal resolution, making it "
38943888
"less noticeable. Usually safe to enable."),
@@ -5005,6 +4999,12 @@ void FullscreenUI::DrawAdvancedSettingsPage()
50054999
&Settings::ParseSaveStateCompressionModeName, &Settings::GetSaveStateCompressionModeName,
50065000
&Settings::GetSaveStateCompressionModeDisplayName, SaveStateCompressionMode::Count);
50075001

5002+
DrawEnumSetting(bsi, FSUI_VSTR("Wireframe Rendering"),
5003+
FSUI_VSTR("Overlays or replaces normal triangle drawing with a wireframe/line view."), "GPU",
5004+
"WireframeMode", GPUWireframeMode::Disabled, &Settings::ParseGPUWireframeMode,
5005+
&Settings::GetGPUWireframeModeName, &Settings::GetGPUWireframeModeDisplayName,
5006+
GPUWireframeMode::Count);
5007+
50085008
MenuHeading(FSUI_VSTR("CPU Emulation"));
50095009

50105010
DrawToggleSetting(bsi, FSUI_VSTR("Enable Recompiler Memory Exceptions"),

‎src/duckstation-qt/graphicssettingswidget.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
150150
&Settings::ParseLineDetectModeName, &Settings::GetLineDetectModeName,
151151
&Settings::GetLineDetectModeDisplayName,
152152
Settings::DEFAULT_GPU_LINE_DETECT_MODE, GPULineDetectMode::Count);
153-
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.gpuWireframeMode, "GPU", "WireframeMode",
154-
Settings::ParseGPUWireframeMode, Settings::GetGPUWireframeModeName,
155-
&Settings::GetGPUWireframeModeDisplayName,
156-
Settings::DEFAULT_GPU_WIREFRAME_MODE, GPUWireframeMode::Count);
157153
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gpuThread, "GPU", "UseThread", true);
158154
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.maxQueuedFrames, "GPU", "MaxQueuedFrames",
159155
Settings::DEFAULT_GPU_MAX_QUEUED_FRAMES);
@@ -349,6 +345,11 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
349345

350346
// Debugging Tab
351347

348+
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.gpuWireframeMode, "GPU", "WireframeMode",
349+
Settings::ParseGPUWireframeMode, Settings::GetGPUWireframeModeName,
350+
&Settings::GetGPUWireframeModeDisplayName,
351+
Settings::DEFAULT_GPU_WIREFRAME_MODE, GPUWireframeMode::Count);
352+
352353
SettingWidgetBinder::BindWidgetToEnumSetting(
353354
sif, m_ui.gpuDumpCompressionMode, "GPU", "DumpCompressionMode", &Settings::ParseGPUDumpCompressionMode,
354355
&Settings::GetGPUDumpCompressionModeName, &Settings::GetGPUDumpCompressionModeDisplayName,
@@ -500,9 +501,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
500501
m_ui.msaaMode, tr("Multi-Sampling"), tr("Disabled"),
501502
tr("Uses multi-sampled anti-aliasing when rendering 3D polygons. Can improve visuals with a lower performance "
502503
"requirement compared to upscaling, <strong>but often introduces rendering errors.</strong>"));
503-
dialog->registerWidgetHelp(m_ui.gpuWireframeMode, tr("Wireframe Mode"), tr("Disabled"),
504-
tr("Draws a wireframe outline of the triangles rendered by the console's GPU, either as a "
505-
"replacement or an overlay."));
506504
dialog->registerWidgetHelp(m_ui.gpuThread, tr("Threaded Rendering"), tr("Checked"),
507505
tr("Uses a second thread for drawing graphics. Provides a significant speed improvement "
508506
"particularly with the software renderer, and is safe to use."));
@@ -681,6 +679,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
681679

682680
// Debugging Tab
683681

682+
dialog->registerWidgetHelp(m_ui.gpuWireframeMode, tr("Wireframe Mode"), tr("Disabled"),
683+
tr("Draws a wireframe outline of the triangles rendered by the console's GPU, either as a "
684+
"replacement or an overlay."));
684685
dialog->registerWidgetHelp(
685686
m_ui.useDebugDevice, tr("Use Debug Device"), tr("Unchecked"),
686687
tr("Enable debugging when supported by the host's renderer API. <strong>Only for developer use.</strong>"));

‎src/duckstation-qt/graphicssettingswidget.ui‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
<property name="title">
317317
<string>Display Options</string>
318318
</property>
319-
<layout class="QGridLayout" name="gridLayout_11" columnstretch="0,1">
319+
<layout class="QGridLayout" name="gridLayout_11" columnstretch="0,1" columnminimumwidth="120,0">
320320
<item row="0" column="0">
321321
<widget class="QLabel" name="exclusiveFullscreenLabel">
322322
<property name="text">
@@ -391,7 +391,7 @@
391391
<property name="title">
392392
<string>Rendering Options</string>
393393
</property>
394-
<layout class="QGridLayout" name="gridLayout_12" columnstretch="0,1">
394+
<layout class="QGridLayout" name="gridLayout_12" columnstretch="0,1" columnminimumwidth="120,0">
395395
<item row="0" column="0">
396396
<widget class="QLabel" name="msaaModeLabel">
397397
<property name="text">
@@ -412,17 +412,7 @@
412412
<item row="1" column="1">
413413
<widget class="QComboBox" name="gpuLineDetectMode"/>
414414
</item>
415-
<item row="2" column="0">
416-
<widget class="QLabel" name="gpuWireframeModeLabel">
417-
<property name="text">
418-
<string>Wireframe Mode:</string>
419-
</property>
420-
</widget>
421-
</item>
422-
<item row="2" column="1">
423-
<widget class="QComboBox" name="gpuWireframeMode"/>
424-
</item>
425-
<item row="3" column="0" colspan="2">
415+
<item row="2" column="0" colspan="2">
426416
<layout class="QGridLayout" name="gridLayout_5">
427417
<item row="1" column="1">
428418
<widget class="QCheckBox" name="scaledInterlacing">
@@ -1447,12 +1437,31 @@
14471437
<property name="bottomMargin">
14481438
<number>0</number>
14491439
</property>
1440+
<item>
1441+
<widget class="QGroupBox" name="groupBox_11">
1442+
<property name="title">
1443+
<string>Rendering Options</string>
1444+
</property>
1445+
<layout class="QGridLayout" name="gridLayout_22" columnstretch="0,1" columnminimumwidth="160,0">
1446+
<item row="0" column="0">
1447+
<widget class="QLabel" name="gpuWireframeModeLabel">
1448+
<property name="text">
1449+
<string>Wireframe Mode:</string>
1450+
</property>
1451+
</widget>
1452+
</item>
1453+
<item row="0" column="1">
1454+
<widget class="QComboBox" name="gpuWireframeMode"/>
1455+
</item>
1456+
</layout>
1457+
</widget>
1458+
</item>
14501459
<item>
14511460
<widget class="QGroupBox" name="gpuDumpGroup">
14521461
<property name="title">
14531462
<string>GPU Dump Recording/Playback</string>
14541463
</property>
1455-
<layout class="QGridLayout" name="gridLayout_17" columnstretch="0,1">
1464+
<layout class="QGridLayout" name="gridLayout_17" columnstretch="0,1" columnminimumwidth="160,0">
14561465
<item row="0" column="0">
14571466
<widget class="QLabel" name="groupDumpCompressionModeLabel">
14581467
<property name="text">

0 commit comments

Comments
 (0)