mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-08 05:29:19 +01:00
Port #3353 from Citra
This commit is contained in:
parent
028d90eb79
commit
ba8ff096fd
10 changed files with 94 additions and 25 deletions
|
@ -78,20 +78,29 @@ void FrameLimiter::DoFrameLimiting(microseconds current_system_time_us) {
|
||||||
// values increase the time needed to recover and limit framerate again after spikes.
|
// values increase the time needed to recover and limit framerate again after spikes.
|
||||||
constexpr microseconds MAX_LAG_TIME_US = 25us;
|
constexpr microseconds MAX_LAG_TIME_US = 25us;
|
||||||
|
|
||||||
if (!Settings::values.toggle_framelimit) {
|
if (!Settings::values.use_frame_limit) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto now = Clock::now();
|
auto now = Clock::now();
|
||||||
|
|
||||||
frame_limiting_delta_err += current_system_time_us - previous_system_time_us;
|
const double sleep_scale = Settings::values.frame_limit / 100.0;
|
||||||
|
|
||||||
|
// Max lag caused by slow frames. Shouldn't be more than the length of a frame at the current
|
||||||
|
// speed percent or it will clamp too much and prevent this from properly limiting to that
|
||||||
|
// percent. High values means it'll take longer after a slow frame to recover and start
|
||||||
|
// limiting
|
||||||
|
const microseconds max_lag_time_us = duration_cast<microseconds>(
|
||||||
|
std::chrono::duration<double, std::chrono::microseconds::period>(25ms / sleep_scale));
|
||||||
|
frame_limiting_delta_err += duration_cast<microseconds>(
|
||||||
|
std::chrono::duration<double, std::chrono::microseconds::period>(
|
||||||
|
(current_system_time_us - previous_system_time_us) / sleep_scale));
|
||||||
frame_limiting_delta_err -= duration_cast<microseconds>(now - previous_walltime);
|
frame_limiting_delta_err -= duration_cast<microseconds>(now - previous_walltime);
|
||||||
frame_limiting_delta_err =
|
frame_limiting_delta_err =
|
||||||
std::clamp(frame_limiting_delta_err, -MAX_LAG_TIME_US, MAX_LAG_TIME_US);
|
std::clamp(frame_limiting_delta_err, -max_lag_time_us, max_lag_time_us);
|
||||||
|
|
||||||
if (frame_limiting_delta_err > microseconds::zero()) {
|
if (frame_limiting_delta_err > microseconds::zero()) {
|
||||||
std::this_thread::sleep_for(frame_limiting_delta_err);
|
std::this_thread::sleep_for(frame_limiting_delta_err);
|
||||||
|
|
||||||
auto now_after_sleep = Clock::now();
|
auto now_after_sleep = Clock::now();
|
||||||
frame_limiting_delta_err -= duration_cast<microseconds>(now_after_sleep - now);
|
frame_limiting_delta_err -= duration_cast<microseconds>(now_after_sleep - now);
|
||||||
now = now_after_sleep;
|
now = now_after_sleep;
|
||||||
|
|
|
@ -130,7 +130,8 @@ struct Values {
|
||||||
|
|
||||||
// Renderer
|
// Renderer
|
||||||
float resolution_factor;
|
float resolution_factor;
|
||||||
bool toggle_framelimit;
|
bool use_frame_limit;
|
||||||
|
u16 frame_limit;
|
||||||
bool use_accurate_framebuffers;
|
bool use_accurate_framebuffers;
|
||||||
|
|
||||||
float bg_red;
|
float bg_red;
|
||||||
|
|
|
@ -161,8 +161,9 @@ TelemetrySession::TelemetrySession() {
|
||||||
Settings::values.use_multi_core);
|
Settings::values.use_multi_core);
|
||||||
AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
|
AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
|
||||||
Settings::values.resolution_factor);
|
Settings::values.resolution_factor);
|
||||||
AddField(Telemetry::FieldType::UserConfig, "Renderer_ToggleFramelimit",
|
AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit",
|
||||||
Settings::values.toggle_framelimit);
|
Settings::values.use_frame_limit);
|
||||||
|
AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit);
|
||||||
AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateFramebuffers",
|
AddField(Telemetry::FieldType::UserConfig, "Renderer_UseAccurateFramebuffers",
|
||||||
Settings::values.use_accurate_framebuffers);
|
Settings::values.use_accurate_framebuffers);
|
||||||
AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode",
|
AddField(Telemetry::FieldType::UserConfig, "System_UseDockedMode",
|
||||||
|
|
|
@ -20,7 +20,7 @@ void RendererBase::RefreshBaseSettings() {
|
||||||
RefreshRasterizerSetting();
|
RefreshRasterizerSetting();
|
||||||
UpdateCurrentFramebufferLayout();
|
UpdateCurrentFramebufferLayout();
|
||||||
|
|
||||||
renderer_settings.use_framelimiter = Settings::values.toggle_framelimit;
|
renderer_settings.use_framelimiter = Settings::values.use_frame_limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RendererBase::RefreshRasterizerSetting() {
|
void RendererBase::RefreshRasterizerSetting() {
|
||||||
|
|
|
@ -83,7 +83,8 @@ void Config::ReadValues() {
|
||||||
|
|
||||||
qt_config->beginGroup("Renderer");
|
qt_config->beginGroup("Renderer");
|
||||||
Settings::values.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat();
|
Settings::values.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat();
|
||||||
Settings::values.toggle_framelimit = qt_config->value("toggle_framelimit", true).toBool();
|
Settings::values.use_frame_limit = qt_config->value("use_frame_limit", true).toBool();
|
||||||
|
Settings::values.frame_limit = qt_config->value("frame_limit", 100).toInt();
|
||||||
Settings::values.use_accurate_framebuffers =
|
Settings::values.use_accurate_framebuffers =
|
||||||
qt_config->value("use_accurate_framebuffers", false).toBool();
|
qt_config->value("use_accurate_framebuffers", false).toBool();
|
||||||
|
|
||||||
|
@ -203,7 +204,8 @@ void Config::SaveValues() {
|
||||||
|
|
||||||
qt_config->beginGroup("Renderer");
|
qt_config->beginGroup("Renderer");
|
||||||
qt_config->setValue("resolution_factor", (double)Settings::values.resolution_factor);
|
qt_config->setValue("resolution_factor", (double)Settings::values.resolution_factor);
|
||||||
qt_config->setValue("toggle_framelimit", Settings::values.toggle_framelimit);
|
qt_config->setValue("use_frame_limit", Settings::values.use_frame_limit);
|
||||||
|
qt_config->setValue("frame_limit", Settings::values.frame_limit);
|
||||||
qt_config->setValue("use_accurate_framebuffers", Settings::values.use_accurate_framebuffers);
|
qt_config->setValue("use_accurate_framebuffers", Settings::values.use_accurate_framebuffers);
|
||||||
|
|
||||||
// Cast to double because Qt's written float values are not human-readable
|
// Cast to double because Qt's written float values are not human-readable
|
||||||
|
|
|
@ -12,6 +12,10 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent)
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
this->setConfiguration();
|
this->setConfiguration();
|
||||||
|
|
||||||
|
ui->frame_limit->setEnabled(Settings::values.use_frame_limit);
|
||||||
|
connect(ui->toggle_frame_limit, &QCheckBox::stateChanged, ui->frame_limit,
|
||||||
|
&QSpinBox::setEnabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigureGraphics::~ConfigureGraphics() = default;
|
ConfigureGraphics::~ConfigureGraphics() = default;
|
||||||
|
@ -58,13 +62,15 @@ Resolution FromResolutionFactor(float factor) {
|
||||||
void ConfigureGraphics::setConfiguration() {
|
void ConfigureGraphics::setConfiguration() {
|
||||||
ui->resolution_factor_combobox->setCurrentIndex(
|
ui->resolution_factor_combobox->setCurrentIndex(
|
||||||
static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
|
static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
|
||||||
ui->toggle_framelimit->setChecked(Settings::values.toggle_framelimit);
|
ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit);
|
||||||
|
ui->frame_limit->setValue(Settings::values.frame_limit);
|
||||||
ui->use_accurate_framebuffers->setChecked(Settings::values.use_accurate_framebuffers);
|
ui->use_accurate_framebuffers->setChecked(Settings::values.use_accurate_framebuffers);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureGraphics::applyConfiguration() {
|
void ConfigureGraphics::applyConfiguration() {
|
||||||
Settings::values.resolution_factor =
|
Settings::values.resolution_factor =
|
||||||
ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex()));
|
ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex()));
|
||||||
Settings::values.toggle_framelimit = ui->toggle_framelimit->isChecked();
|
Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked();
|
||||||
|
Settings::values.frame_limit = ui->frame_limit->value();
|
||||||
Settings::values.use_accurate_framebuffers = ui->use_accurate_framebuffers->isChecked();
|
Settings::values.use_accurate_framebuffers = ui->use_accurate_framebuffers->isChecked();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,12 +23,32 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="toggle_framelimit">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="toggle_frame_limit">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Limit framerate</string>
|
<string>Limit Speed Percent</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="frame_limit">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>%</string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>9999</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="use_accurate_framebuffers">
|
<widget class="QCheckBox" name="use_accurate_framebuffers">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|
|
@ -226,6 +226,10 @@ void GMainWindow::InitializeHotkeys() {
|
||||||
Qt::ApplicationShortcut);
|
Qt::ApplicationShortcut);
|
||||||
hotkey_registry.RegisterHotkey("Main Window", "Toggle Speed Limit", QKeySequence("CTRL+Z"),
|
hotkey_registry.RegisterHotkey("Main Window", "Toggle Speed Limit", QKeySequence("CTRL+Z"),
|
||||||
Qt::ApplicationShortcut);
|
Qt::ApplicationShortcut);
|
||||||
|
hotkey_registry.RegisterHotkey("Main Window", "Increase Speed Limit", QKeySequence("+"),
|
||||||
|
Qt::ApplicationShortcut);
|
||||||
|
hotkey_registry.RegisterHotkey("Main Window", "Decrease Speed Limit", QKeySequence("-"),
|
||||||
|
Qt::ApplicationShortcut);
|
||||||
hotkey_registry.LoadHotkeys();
|
hotkey_registry.LoadHotkeys();
|
||||||
|
|
||||||
connect(hotkey_registry.GetHotkey("Main Window", "Load File", this), &QShortcut::activated,
|
connect(hotkey_registry.GetHotkey("Main Window", "Load File", this), &QShortcut::activated,
|
||||||
|
@ -255,9 +259,24 @@ void GMainWindow::InitializeHotkeys() {
|
||||||
});
|
});
|
||||||
connect(hotkey_registry.GetHotkey("Main Window", "Toggle Speed Limit", this),
|
connect(hotkey_registry.GetHotkey("Main Window", "Toggle Speed Limit", this),
|
||||||
&QShortcut::activated, this, [&] {
|
&QShortcut::activated, this, [&] {
|
||||||
Settings::values.toggle_framelimit = !Settings::values.toggle_framelimit;
|
Settings::values.use_frame_limit = !Settings::values.use_frame_limit;
|
||||||
UpdateStatusBar();
|
UpdateStatusBar();
|
||||||
});
|
});
|
||||||
|
constexpr u16 SPEED_LIMIT_STEP = 5;
|
||||||
|
connect(hotkey_registry.GetHotkey("Main Window", "Increase Speed Limit", this),
|
||||||
|
&QShortcut::activated, this, [&] {
|
||||||
|
if (Settings::values.frame_limit < 9999 - SPEED_LIMIT_STEP) {
|
||||||
|
Settings::values.frame_limit += SPEED_LIMIT_STEP;
|
||||||
|
UpdateStatusBar();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
connect(hotkey_registry.GetHotkey("Main Window", "Decrease Speed Limit", this),
|
||||||
|
&QShortcut::activated, this, [&] {
|
||||||
|
if (Settings::values.frame_limit > SPEED_LIMIT_STEP) {
|
||||||
|
Settings::values.frame_limit -= SPEED_LIMIT_STEP;
|
||||||
|
UpdateStatusBar();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::SetDefaultUIGeometry() {
|
void GMainWindow::SetDefaultUIGeometry() {
|
||||||
|
@ -910,7 +929,13 @@ void GMainWindow::UpdateStatusBar() {
|
||||||
|
|
||||||
auto results = Core::System::GetInstance().GetAndResetPerfStats();
|
auto results = Core::System::GetInstance().GetAndResetPerfStats();
|
||||||
|
|
||||||
|
if (Settings::values.use_frame_limit) {
|
||||||
|
emu_speed_label->setText(tr("Speed: %1% / %2%")
|
||||||
|
.arg(results.emulation_speed * 100.0, 0, 'f', 0)
|
||||||
|
.arg(Settings::values.frame_limit));
|
||||||
|
} else {
|
||||||
emu_speed_label->setText(tr("Speed: %1%").arg(results.emulation_speed * 100.0, 0, 'f', 0));
|
emu_speed_label->setText(tr("Speed: %1%").arg(results.emulation_speed * 100.0, 0, 'f', 0));
|
||||||
|
}
|
||||||
game_fps_label->setText(tr("Game: %1 FPS").arg(results.game_fps, 0, 'f', 0));
|
game_fps_label->setText(tr("Game: %1 FPS").arg(results.game_fps, 0, 'f', 0));
|
||||||
emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));
|
emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));
|
||||||
|
|
||||||
|
|
|
@ -96,8 +96,9 @@ void Config::ReadValues() {
|
||||||
// Renderer
|
// Renderer
|
||||||
Settings::values.resolution_factor =
|
Settings::values.resolution_factor =
|
||||||
(float)sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
|
(float)sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
|
||||||
Settings::values.toggle_framelimit =
|
Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true);
|
||||||
sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true);
|
Settings::values.frame_limit =
|
||||||
|
static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100));
|
||||||
Settings::values.use_accurate_framebuffers =
|
Settings::values.use_accurate_framebuffers =
|
||||||
sdl2_config->GetBoolean("Renderer", "use_accurate_framebuffers", false);
|
sdl2_config->GetBoolean("Renderer", "use_accurate_framebuffers", false);
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,14 @@ resolution_factor =
|
||||||
# 0 (default): Off, 1: On
|
# 0 (default): Off, 1: On
|
||||||
use_vsync =
|
use_vsync =
|
||||||
|
|
||||||
|
# Turns on the frame limiter, which will limit frames output to the target game speed
|
||||||
|
# 0: Off, 1: On (default)
|
||||||
|
use_frame_limit =
|
||||||
|
|
||||||
|
# Limits the speed of the game to run no faster than this value as a percentage of target speed
|
||||||
|
# 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)
|
||||||
|
frame_limit =
|
||||||
|
|
||||||
# Whether to use accurate framebuffers
|
# Whether to use accurate framebuffers
|
||||||
# 0 (default): Off (fast), 1 : On (slow)
|
# 0 (default): Off (fast), 1 : On (slow)
|
||||||
use_accurate_framebuffers =
|
use_accurate_framebuffers =
|
||||||
|
@ -132,10 +140,6 @@ custom_bottom_top =
|
||||||
custom_bottom_right =
|
custom_bottom_right =
|
||||||
custom_bottom_bottom =
|
custom_bottom_bottom =
|
||||||
|
|
||||||
# Whether to toggle frame limiter on or off.
|
|
||||||
# 0: Off, 1 (default): On
|
|
||||||
toggle_framelimit =
|
|
||||||
|
|
||||||
# Swaps the prominent screen with the other screen.
|
# Swaps the prominent screen with the other screen.
|
||||||
# For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.
|
# For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.
|
||||||
# 0 (default): Top Screen is prominent, 1: Bottom Screen is prominent
|
# 0 (default): Top Screen is prominent, 1: Bottom Screen is prominent
|
||||||
|
|
Loading…
Reference in a new issue