Settings: Purge max display FPS option

No longer needed since we pull it from the surface instead.
This commit is contained in:
Stenzek 2024-05-24 02:32:41 +10:00
parent 42a5fe0a6e
commit 49e3663dfe
No known key found for this signature in database
5 changed files with 1 additions and 26 deletions

View File

@ -5086,10 +5086,6 @@ void FullscreenUI::DrawAdvancedSettingsPage()
DrawToggleSetting(bsi, FSUI_CSTR("Show Enhancement Settings"), DrawToggleSetting(bsi, FSUI_CSTR("Show Enhancement Settings"),
FSUI_CSTR("Shows enhancement settings in the bottom-right corner of the screen."), "Display", FSUI_CSTR("Shows enhancement settings in the bottom-right corner of the screen."), "Display",
"ShowEnhancements", false); "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( DrawToggleSetting(
bsi, FSUI_CSTR("Stretch Display Vertically"), bsi, FSUI_CSTR("Stretch Display Vertically"),
FSUI_CSTR("Stretches the display to match the aspect ratio by multiplying vertically instead of horizontally."), FSUI_CSTR("Stretches the display to match the aspect ratio by multiplying vertically instead of horizontally."),

View File

@ -291,7 +291,6 @@ void Settings::Load(SettingsInterface& si)
display_show_inputs = si.GetBoolValue("Display", "ShowInputs", false); display_show_inputs = si.GetBoolValue("Display", "ShowInputs", false);
display_show_enhancements = si.GetBoolValue("Display", "ShowEnhancements", false); display_show_enhancements = si.GetBoolValue("Display", "ShowEnhancements", false);
display_stretch_vertically = si.GetBoolValue("Display", "StretchVertically", 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); display_osd_scale = si.GetFloatValue("Display", "OSDScale", DEFAULT_OSD_SCALE);
cdrom_readahead_sectors = cdrom_readahead_sectors =
@ -548,7 +547,6 @@ void Settings::Save(SettingsInterface& si, bool ignore_base) const
} }
si.SetBoolValue("Display", "StretchVertically", display_stretch_vertically); si.SetBoolValue("Display", "StretchVertically", display_stretch_vertically);
si.SetFloatValue("Display", "MaxFPS", display_max_fps);
si.SetIntValue("CDROM", "ReadaheadSectors", cdrom_readahead_sectors); si.SetIntValue("CDROM", "ReadaheadSectors", cdrom_readahead_sectors);
si.SetStringValue("CDROM", "MechaconVersion", GetCDROMMechVersionName(cdrom_mechacon_version)); si.SetStringValue("CDROM", "MechaconVersion", GetCDROMMechVersionName(cdrom_mechacon_version));

View File

@ -166,7 +166,6 @@ struct Settings
bool display_show_enhancements : 1 = false; bool display_show_enhancements : 1 = false;
bool display_stretch_vertically : 1 = false; bool display_stretch_vertically : 1 = false;
float display_pre_frame_sleep_buffer = DEFAULT_DISPLAY_PRE_FRAME_SLEEP_BUFFER; 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 display_osd_scale = 100.0f;
float gpu_pgxp_tolerance = -1.0f; float gpu_pgxp_tolerance = -1.0f;
float gpu_pgxp_depth_clear_threshold = DEFAULT_GPU_PGXP_DEPTH_THRESHOLD / GPU_PGXP_DEPTH_THRESHOLD_SCALE; float gpu_pgxp_depth_clear_threshold = DEFAULT_GPU_PGXP_DEPTH_THRESHOLD / GPU_PGXP_DEPTH_THRESHOLD_SCALE;
@ -507,11 +506,9 @@ struct Settings
#ifndef __ANDROID__ #ifndef __ANDROID__
static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = true; static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = true;
static constexpr bool DEFAULT_FAST_BOOT_VALUE = false; static constexpr bool DEFAULT_FAST_BOOT_VALUE = false;
static constexpr float DEFAULT_DISPLAY_MAX_FPS = 0.0f;
#else #else
static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = false; static constexpr bool DEFAULT_SAVE_STATE_BACKUPS = false;
static constexpr bool DEFAULT_FAST_BOOT_VALUE = true; static constexpr bool DEFAULT_FAST_BOOT_VALUE = true;
static constexpr float DEFAULT_DISPLAY_MAX_FPS = 60.0f;
#endif #endif
}; };

View File

@ -123,8 +123,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.displayAlignment, "Display", "Alignment", SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.displayAlignment, "Display", "Alignment",
&Settings::ParseDisplayAlignment, &Settings::GetDisplayAlignmentName, &Settings::ParseDisplayAlignment, &Settings::GetDisplayAlignmentName,
Settings::DEFAULT_DISPLAY_ALIGNMENT); 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.gpuThread, "GPU", "UseThread", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.threadedPresentation, "GPU", "ThreadedPresentation", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.threadedPresentation, "GPU", "ThreadedPresentation", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.stretchDisplayVertically, "Display", "StretchVertically", SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.stretchDisplayVertically, "Display", "StretchVertically",
@ -330,10 +328,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
m_ui.displayAlignment, tr("Position"), m_ui.displayAlignment, tr("Position"),
QString::fromUtf8(Settings::GetDisplayAlignmentDisplayName(Settings::DEFAULT_DISPLAY_ALIGNMENT)), QString::fromUtf8(Settings::GetDisplayAlignmentDisplayName(Settings::DEFAULT_DISPLAY_ALIGNMENT)),
tr("Determines the position on the screen when black borders must be added.")); 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 <strong>displayed</strong> every second. Discard frames are <strong>still "
"rendered.</strong> This option can increase frame rates when fast forwarding on some systems."));
dialog->registerWidgetHelp(m_ui.gpuThread, tr("Threaded Rendering"), tr("Checked"), dialog->registerWidgetHelp(m_ui.gpuThread, tr("Threaded Rendering"), tr("Checked"),
tr("Uses a second thread for drawing graphics. Currently only available for the software " 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.")); "renderer, but can provide a significant speed improvement, and is safe to use."));

View File

@ -415,17 +415,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="displayAlignment"/> <widget class="QComboBox" name="displayAlignment"/>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Display FPS Limit:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="displayFPSLimit"/>
</item>
<item row="3" column="0" colspan="2">
<layout class="QGridLayout" name="advancedDisplayOptionsLayout"> <layout class="QGridLayout" name="advancedDisplayOptionsLayout">
<item row="1" column="1"> <item row="1" column="1">
<widget class="QCheckBox" name="blitSwapChain"> <widget class="QCheckBox" name="blitSwapChain">