Skip to content

Commit 37efd34

Browse files
stenzekstenzek
committed
Qt: Drop renderer option from setup wizard
No need when automatic renderer exists.
1 parent d63ae97 commit 37efd34

File tree

2 files changed

+23
-48
lines changed

2 files changed

+23
-48
lines changed

‎src/duckstation-qt/setupwizarddialog.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -520,17 +520,6 @@ void SetupWizardDialog::doMultipleDeviceAutomaticBinding(u32 port, QLabel* updat
520520

521521
void SetupWizardDialog::setupGraphicsPage(bool initial)
522522
{
523-
SettingWidgetBinder::DisconnectWidget(m_ui.renderer);
524-
m_ui.renderer->clear();
525-
526-
for (u32 i = 0; i < static_cast<u32>(GPURenderer::Count); i++)
527-
{
528-
m_ui.renderer->addItem(QString::fromUtf8(Settings::GetRendererDisplayName(static_cast<GPURenderer>(i))));
529-
}
530-
531-
SettingWidgetBinder::BindWidgetToEnumSetting(nullptr, m_ui.renderer, "GPU", "Renderer", &Settings::ParseRendererName,
532-
&Settings::GetRendererName, Settings::DEFAULT_GPU_RENDERER);
533-
534523
SettingWidgetBinder::DisconnectWidget(m_ui.resolutionScale);
535524
m_ui.resolutionScale->clear();
536525
GraphicsSettingsWidget::populateUpscalingModes(m_ui.resolutionScale, 16);

‎src/duckstation-qt/setupwizarddialog.ui‎

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -753,69 +753,69 @@
753753
<number>10</number>
754754
</property>
755755
<item row="0" column="0">
756-
<widget class="QLabel" name="label_2">
756+
<widget class="QLabel" name="resolutionScaleLabel">
757757
<property name="text">
758-
<string>Renderer:</string>
758+
<string>Internal Resolution:</string>
759759
</property>
760760
</widget>
761761
</item>
762762
<item row="0" column="1">
763-
<widget class="QComboBox" name="renderer">
763+
<widget class="QComboBox" name="resolutionScale">
764764
<property name="toolTip">
765-
<string>Selects the backend to use for rendering the console/game visuals.</string>
765+
<string>Setting this beyond 1x will enhance the resolution of rendered 3D polygons and lines. Only applies to the hardware backends. &lt;br&gt;This option is usually safe, with most games looking fine at higher resolutions. Higher resolutions require a more powerful GPU.</string>
766766
</property>
767767
</widget>
768768
</item>
769769
<item row="1" column="0">
770-
<widget class="QLabel" name="resolutionScaleLabel">
770+
<widget class="QLabel" name="textureFilteringLabel">
771771
<property name="text">
772-
<string>Internal Resolution:</string>
772+
<string>Texture Filtering:</string>
773773
</property>
774774
</widget>
775775
</item>
776776
<item row="1" column="1">
777-
<widget class="QComboBox" name="resolutionScale">
777+
<widget class="QComboBox" name="textureFiltering">
778778
<property name="toolTip">
779-
<string>Setting this beyond 1x will enhance the resolution of rendered 3D polygons and lines. Only applies to the hardware backends. &lt;br&gt;This option is usually safe, with most games looking fine at higher resolutions. Higher resolutions require a more powerful GPU.</string>
779+
<string>Smooths out the blockiness of magnified textures on 3D objects by using filtering. &lt;br&gt;Will have a greater effect on higher resolution scales.</string>
780780
</property>
781781
</widget>
782782
</item>
783783
<item row="2" column="0">
784-
<widget class="QLabel" name="textureFilteringLabel">
784+
<widget class="QLabel" name="spriteTextureFilteringLabel">
785785
<property name="text">
786-
<string>Texture Filtering:</string>
786+
<string>Sprite Texture Filtering:</string>
787787
</property>
788788
</widget>
789789
</item>
790790
<item row="2" column="1">
791-
<widget class="QComboBox" name="textureFiltering">
791+
<widget class="QComboBox" name="spriteTextureFiltering">
792792
<property name="toolTip">
793-
<string>Smooths out the blockiness of magnified textures on 3D objects by using filtering. &lt;br&gt;Will have a greater effect on higher resolution scales.</string>
793+
<string>Smooths out the blockiness of magnified textures on 2D objects by using filtering. This filter only applies to sprites and other 2D elements, such as the HUD.</string>
794794
</property>
795795
</widget>
796796
</item>
797797
<item row="3" column="0">
798-
<widget class="QLabel" name="spriteTextureFilteringLabel">
798+
<widget class="QLabel" name="gpuDitheringModeLabel">
799799
<property name="text">
800-
<string>Sprite Texture Filtering:</string>
800+
<string>Dithering:</string>
801801
</property>
802802
</widget>
803803
</item>
804804
<item row="3" column="1">
805-
<widget class="QComboBox" name="spriteTextureFiltering">
805+
<widget class="QComboBox" name="gpuDitheringMode">
806806
<property name="toolTip">
807-
<string>Smooths out the blockiness of magnified textures on 2D objects by using filtering. This filter only applies to sprites and other 2D elements, such as the HUD.</string>
807+
<string>Controls how dithering is applied in the emulated GPU. True Color disables dithering and produces the nicest looking gradients. Scaled options make the dither pattern less noticeable at higher resolutions. Shader Blending options perform blending in software, and are more accurate but have a &lt;strong&gt;significant&lt;/strong&gt; performance penalty.</string>
808808
</property>
809809
</widget>
810810
</item>
811-
<item row="5" column="0">
811+
<item row="4" column="0">
812812
<widget class="QLabel" name="label_18">
813813
<property name="text">
814814
<string>Aspect Ratio:</string>
815815
</property>
816816
</widget>
817817
</item>
818-
<item row="5" column="1">
818+
<item row="4" column="1">
819819
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="1,0,0,0">
820820
<item>
821821
<widget class="QComboBox" name="displayAspectRatio">
@@ -853,35 +853,35 @@
853853
</item>
854854
</layout>
855855
</item>
856-
<item row="6" column="0">
856+
<item row="5" column="0">
857857
<widget class="QLabel" name="label_19">
858858
<property name="text">
859859
<string>Crop:</string>
860860
</property>
861861
</widget>
862862
</item>
863-
<item row="6" column="1">
863+
<item row="5" column="1">
864864
<widget class="QComboBox" name="displayCropMode">
865865
<property name="toolTip">
866866
<string>Determines how much of the area typically not visible on a consumer TV set to crop/hide. Some games display content in the overscan area, or use it for screen effects. May not display correctly with the &quot;All Borders&quot; setting. &quot;Only Overscan&quot; offers a good compromise between stability and hiding black borders.</string>
867867
</property>
868868
</widget>
869869
</item>
870-
<item row="7" column="0">
870+
<item row="6" column="0">
871871
<widget class="QLabel" name="label_20">
872872
<property name="text">
873873
<string>Scaling:</string>
874874
</property>
875875
</widget>
876876
</item>
877-
<item row="7" column="1">
877+
<item row="6" column="1">
878878
<widget class="QComboBox" name="displayScaling">
879879
<property name="toolTip">
880880
<string>Determines how the emulated console's output is upscaled or downscaled to your monitor's resolution.</string>
881881
</property>
882882
</widget>
883883
</item>
884-
<item row="8" column="0" colspan="2">
884+
<item row="7" column="0" colspan="2">
885885
<layout class="QGridLayout" name="gridLayout_2">
886886
<item row="0" column="1">
887887
<widget class="QCheckBox" name="widescreenHack">
@@ -905,20 +905,6 @@
905905
</item>
906906
</layout>
907907
</item>
908-
<item row="4" column="0">
909-
<widget class="QLabel" name="gpuDitheringModeLabel">
910-
<property name="text">
911-
<string>Dithering:</string>
912-
</property>
913-
</widget>
914-
</item>
915-
<item row="4" column="1">
916-
<widget class="QComboBox" name="gpuDitheringMode">
917-
<property name="toolTip">
918-
<string>Controls how dithering is applied in the emulated GPU. True Color disables dithering and produces the nicest looking gradients. Scaled options make the dither pattern less noticeable at higher resolutions. Shader Blending options perform blending in software, and are more accurate but have a &lt;strong&gt;significant&lt;/strong&gt; performance penalty.</string>
919-
</property>
920-
</widget>
921-
</item>
922908
</layout>
923909
</item>
924910
<item>

0 commit comments

Comments
 (0)