From c41f82b2e28951391145b0760e50fab2c9cd0ef1 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 30 Jun 2021 15:40:31 +1000 Subject: [PATCH] Qt: Move some options around --- src/duckstation-qt/displaysettingswidget.cpp | 13 ++++++---- src/duckstation-qt/displaysettingswidget.ui | 24 +++++++++---------- .../emulationsettingswidget.cpp | 9 ------- src/duckstation-qt/emulationsettingswidget.ui | 7 ------ .../enhancementsettingswidget.cpp | 6 +++++ .../enhancementsettingswidget.ui | 7 ++++++ 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/duckstation-qt/displaysettingswidget.cpp b/src/duckstation-qt/displaysettingswidget.cpp index 4226984e9..074793560 100644 --- a/src/duckstation-qt/displaysettingswidget.cpp +++ b/src/duckstation-qt/displaysettingswidget.cpp @@ -48,8 +48,8 @@ DisplaySettingsWidget::DisplaySettingsWidget(QtHostInterface* host_interface, QW SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.gpuThread, "GPU", "UseThread", true); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.threadedPresentation, "GPU", "ThreadedPresentation", true); - SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.useSoftwareRendererForReadbacks, "GPU", - "UseSoftwareRendererForReadbacks", false); + SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.syncToHostRefreshRate, "Main", + "SyncToHostRefreshRate", false); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.showOSDMessages, "Display", "ShowOSDMessages", true); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.showFPS, "Display", "ShowFPS", false); @@ -133,9 +133,12 @@ DisplaySettingsWidget::DisplaySettingsWidget(QtHostInterface* host_interface, QW 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.useSoftwareRendererForReadbacks, tr("Use Software Renderer For Readbacks"), tr("Unchecked"), - tr("Runs the software renderer in parallel for VRAM readbacks. On some systems, this may result in greater " - "performance when using graphical enhancements with the hardware renderer.")); + m_ui.syncToHostRefreshRate, tr("Sync To Host Refresh Rate"), tr("Unchecked"), + tr("Adjusts the emulation speed so the console's refresh rate matches the host's refresh rate when both VSync and " + "Audio Resampling settings are enabled. This results in the smoothest animations possible, at the cost of " + "potentially increasing the emulation speed by less than 1%. Sync To Host Refresh Rate will not take effect if " + "the console's refresh rate is too far from the host's refresh rate. Users with variable refresh rate displays " + "should disable this option.")); dialog->registerWidgetHelp(m_ui.showOSDMessages, tr("Show OSD Messages"), tr("Checked"), tr("Shows on-screen-display messages when events occur such as save states being " "created/loaded, screenshots being taken, etc.")); diff --git a/src/duckstation-qt/displaysettingswidget.ui b/src/duckstation-qt/displaysettingswidget.ui index bc04f412e..d9fd81bae 100644 --- a/src/duckstation-qt/displaysettingswidget.ui +++ b/src/duckstation-qt/displaysettingswidget.ui @@ -72,30 +72,30 @@ - - - VSync - - - - Threaded Presentation - - + + - Optimal Frame Pacing + VSync + + + + + + + Sync To Host Refresh Rate - + - Use Software Renderer For Readbacks + Optimal Frame Pacing diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp index 31b3757be..34a587241 100644 --- a/src/duckstation-qt/emulationsettingswidget.cpp +++ b/src/duckstation-qt/emulationsettingswidget.cpp @@ -12,8 +12,6 @@ EmulationSettingsWidget::EmulationSettingsWidget(QtHostInterface* host_interface { m_ui.setupUi(this); - SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.syncToHostRefreshRate, "Main", - "SyncToHostRefreshRate", false); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.rewindEnable, "Main", "RewindEnable", false); SettingWidgetBinder::BindWidgetToFloatSetting(m_host_interface, m_ui.rewindSaveFrequency, "Main", "RewindFrequency", 10.0f); @@ -61,13 +59,6 @@ EmulationSettingsWidget::EmulationSettingsWidget(QtHostInterface* host_interface m_ui.turboSpeed, tr("Turbo Speed"), tr("User Preference"), tr("Sets the turbo speed. This speed will be used when the turbo hotkey is pressed/toggled. Turboing will take " "priority over fast forwarding if both hotkeys are pressed/toggled.")); - dialog->registerWidgetHelp( - m_ui.syncToHostRefreshRate, tr("Sync To Host Refresh Rate"), tr("Unchecked"), - tr("Adjusts the emulation speed so the console's refresh rate matches the host's refresh rate when both VSync and " - "Audio Resampling settings are enabled. This results in the smoothest animations possible, at the cost of " - "potentially increasing the emulation speed by less than 1%. Sync To Host Refresh Rate will not take effect if " - "the console's refresh rate is too far from the host's refresh rate. Users with variable refresh rate displays " - "should disable this option.")); dialog->registerWidgetHelp( m_ui.rewindEnable, tr("Rewinding"), tr("Unchecked"), tr("Enable Rewinding: Saves state periodically so you can rewind any mistakes while playing.
" diff --git a/src/duckstation-qt/emulationsettingswidget.ui b/src/duckstation-qt/emulationsettingswidget.ui index 9a20a5758..34d54ae8a 100644 --- a/src/duckstation-qt/emulationsettingswidget.ui +++ b/src/duckstation-qt/emulationsettingswidget.ui @@ -62,13 +62,6 @@ - - - - Sync To Host Refresh Rate - - - diff --git a/src/duckstation-qt/enhancementsettingswidget.cpp b/src/duckstation-qt/enhancementsettingswidget.cpp index 08ee4f407..551ca1e15 100644 --- a/src/duckstation-qt/enhancementsettingswidget.cpp +++ b/src/duckstation-qt/enhancementsettingswidget.cpp @@ -27,6 +27,8 @@ EnhancementSettingsWidget::EnhancementSettingsWidget(QtHostInterface* host_inter &Settings::ParseTextureFilterName, &Settings::GetTextureFilterName, Settings::DEFAULT_GPU_TEXTURE_FILTER); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.widescreenHack, "GPU", "WidescreenHack", false); + SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.useSoftwareRendererForReadbacks, "GPU", + "UseSoftwareRendererForReadbacks", false); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.pgxpEnable, "GPU", "PGXPEnable", false); SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.pgxpCulling, "GPU", "PGXPCulling", true); @@ -98,6 +100,10 @@ EnhancementSettingsWidget::EnhancementSettingsWidget(QtHostInterface* host_inter "increasing the field of view from 4:3 to the chosen display aspect ratio in 3D games.
For 2D games, or " "games which use pre-rendered backgrounds, this enhancement will not work as expected.
May not be " "compatible with all games.")); + dialog->registerWidgetHelp( + m_ui.useSoftwareRendererForReadbacks, tr("Use Software Renderer For Readbacks"), tr("Unchecked"), + tr("Runs the software renderer in parallel for VRAM readbacks. On some systems, this may result in greater " + "performance when using graphical enhancements with the hardware renderer.")); dialog->registerWidgetHelp( m_ui.pgxpEnable, tr("Geometry Correction"), tr("Unchecked"), tr("Reduces \"wobbly\" polygons and \"warping\" textures that are common in PS1 games.
Only " diff --git a/src/duckstation-qt/enhancementsettingswidget.ui b/src/duckstation-qt/enhancementsettingswidget.ui index d8df81245..2b8b1b7ca 100644 --- a/src/duckstation-qt/enhancementsettingswidget.ui +++ b/src/duckstation-qt/enhancementsettingswidget.ui @@ -73,6 +73,13 @@ + + + + Software Renderer Readbacks (run in parallel for VRAM->CPU transfers) + + +