summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-28 20:40:57 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:36:01 +0200
commita7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e (patch)
tree2bafe9b30f876a02cd472de0e150286d009db70b
parentSingleCore: Use Cycle Timing instead of Host Timing. (diff)
downloadyuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar.gz
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar.bz2
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar.lz
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar.xz
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.tar.zst
yuzu-a7ecd9e19cd2d46768c7c55e1aa7f5e4870d7c9e.zip
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp1
-rw-r--r--src/core/perf_stats.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
index 19df0dca7..3f7b8e670 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -41,6 +41,7 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u3
system.GetPerfStats().EndGameFrame();
system.GetPerfStats().EndSystemFrame();
system.GPU().SwapBuffers(&framebuffer);
+ system.FrameLimiter().DoFrameLimiting(system.CoreTiming().GetGlobalTimeUs());
system.GetPerfStats().BeginSystemFrame();
}
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index f1ae9d4df..9f3a6b811 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -119,7 +119,7 @@ double PerfStats::GetLastFrameTimeScale() {
}
void FrameLimiter::DoFrameLimiting(microseconds current_system_time_us) {
- if (!Settings::values.use_frame_limit) {
+ if (!Settings::values.use_frame_limit || Settings::values.use_multi_core) {
return;
}