summaryrefslogtreecommitdiffstats
path: root/src/core/perf_stats.cpp
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2018-08-21 01:14:06 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-08-21 01:14:06 +0200
commitba8ff096fdc9f7ab101851c4cd06c3244a7d84c3 (patch)
tree927b7495e2674a375aca8a4b004907e8af76c638 /src/core/perf_stats.cpp
parentMerge pull request #1104 from Subv/instanced_arrays (diff)
downloadyuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.gz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.bz2
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.lz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.xz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.zst
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.zip
Diffstat (limited to '')
-rw-r--r--src/core/perf_stats.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index 8e09b9b63..c6022c02a 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -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.
constexpr microseconds MAX_LAG_TIME_US = 25us;
- if (!Settings::values.toggle_framelimit) {
+ if (!Settings::values.use_frame_limit) {
return;
}
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 =
- 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()) {
std::this_thread::sleep_for(frame_limiting_delta_err);
-
auto now_after_sleep = Clock::now();
frame_limiting_delta_err -= duration_cast<microseconds>(now_after_sleep - now);
now = now_after_sleep;