From 49e3663dfeb78831e2e087553fba8918b5a98b50 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 24 May 2024 02:32:41 +1000 Subject: [PATCH] Settings: Purge max display FPS option No longer needed since we pull it from the surface instead. --- src/core/fullscreen_ui.cpp | 4 ---- src/core/settings.cpp | 2 -- src/core/settings.h | 3 --- src/duckstation-qt/graphicssettingswidget.cpp | 6 ------ src/duckstation-qt/graphicssettingswidget.ui | 12 +----------- 5 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 87f323e28..de7a9b2a2 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -5086,10 +5086,6 @@ 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); - DrawFloatRangeSetting( - bsi, FSUI_CSTR("Display FPS Limit"), - FSUI_CSTR("Limits how many frames are displayed to the screen. These frames are still rendered."), "Display", - "MaxFPS", Settings::DEFAULT_DISPLAY_MAX_FPS, 0.0f, 500.0f, "%.2f FPS"); DrawToggleSetting( bsi, FSUI_CSTR("Stretch Display Vertically"), FSUI_CSTR("Stretches the display to match the aspect ratio by multiplying vertically instead of horizontally."), diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 153a849a1..5c88343cb 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -291,7 +291,6 @@ void Settings::Load(SettingsInterface& si) display_show_inputs = si.GetBoolValue("Display", "ShowInputs", false); display_show_enhancements = si.GetBoolValue("Display", "ShowEnhancements", false); display_stretch_vertically = si.GetBoolValue("Display", "StretchVertically", false); - display_max_fps = si.GetFloatValue("Display", "MaxFPS", DEFAULT_DISPLAY_MAX_FPS); display_osd_scale = si.GetFloatValue("Display", "OSDScale", DEFAULT_OSD_SCALE); cdrom_readahead_sectors = @@ -548,7 +547,6 @@ void Settings::Save(SettingsInterface& si, bool ignore_base) const } si.SetBoolValue("Display", "StretchVertically", display_stretch_vertically); - si.SetFloatValue("Display", "MaxFPS", display_max_fps); si.SetIntValue("CDROM", "ReadaheadSectors", cdrom_readahead_sectors); si.SetStringValue("CDROM", "MechaconVersion", GetCDROMMechVersionName(cdrom_mechacon_version)); diff --git a/src/core/settings.h b/src/core/settings.h index 80203ba88..8dfcdc99b 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -166,7 +166,6 @@ struct Settings bool display_show_enhancements : 1 = false; bool display_stretch_vertically : 1 = false; float display_pre_frame_sleep_buffer = DEFAULT_DISPLAY_PRE_FRAME_SLEEP_BUFFER; - float display_max_fps = DEFAULT_DISPLAY_MAX_FPS; float display_osd_scale = 100.0f; float gpu_pgxp_tolerance = -1.0f; float gpu_pgxp_depth_clear_threshold = DEFAULT_GPU_PGXP_DEPTH_THRESHOLD / GPU_PGXP_DEPTH_THRESHOLD_SCALE; @@ -507,11 +506,9 @@ struct Settings #ifndef __ANDROID__ static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = true; static constexpr bool DEFAULT_FAST_BOOT_VALUE = false; - static constexpr float DEFAULT_DISPLAY_MAX_FPS = 0.0f; #else static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = false; static constexpr bool DEFAULT_FAST_BOOT_VALUE = true; - static constexpr float DEFAULT_DISPLAY_MAX_FPS = 60.0f; #endif }; diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index 5aacd8697..564c0171e 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -123,8 +123,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.displayAlignment, "Display", "Alignment", &Settings::ParseDisplayAlignment, &Settings::GetDisplayAlignmentName, Settings::DEFAULT_DISPLAY_ALIGNMENT); - SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.displayFPSLimit, "Display", "MaxFPS", - Settings::DEFAULT_DISPLAY_MAX_FPS); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gpuThread, "GPU", "UseThread", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.threadedPresentation, "GPU", "ThreadedPresentation", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.stretchDisplayVertically, "Display", "StretchVertically", @@ -330,10 +328,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.displayFPSLimit, tr("Display FPS Limit"), tr("0"), - tr("Limits the number of frames that are displayed every second. Discard frames are still " - "rendered. This option can increase frame rates when fast forwarding on some systems.")); 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.")); diff --git a/src/duckstation-qt/graphicssettingswidget.ui b/src/duckstation-qt/graphicssettingswidget.ui index f3d19aa57..441b84962 100644 --- a/src/duckstation-qt/graphicssettingswidget.ui +++ b/src/duckstation-qt/graphicssettingswidget.ui @@ -415,17 +415,7 @@ - - - - Display FPS Limit: - - - - - - - +