summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-01-17 07:23:43 +0100
committerGitHub <noreply@github.com>2018-01-17 07:23:43 +0100
commit9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2 (patch)
tree499549b1713ce88df4b9285bcba065cc79144acc
parentMerge pull request #34 from shinyquagsire23/hid-sharedmem-layouts-circbufs-meta (diff)
parentUI: Fix frame rate perf stats (diff)
downloadyuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar.gz
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar.bz2
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar.lz
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar.xz
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.tar.zst
yuzu-9ae55884d2ccdb15e9eef7dabb4a76cb90b697c2.zip
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp3
-rw-r--r--src/core/perf_stats.cpp2
2 files changed, 4 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 c42a65b36..b65d79f11 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -4,6 +4,7 @@
#include "common/assert.h"
#include "common/logging/log.h"
+#include "core/core.h"
#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
#include "core/hle/service/nvdrv/devices/nvmap.h"
#include "video_core/renderer_base.h"
@@ -28,6 +29,8 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u3
using PixelFormat = RendererBase::FramebufferInfo::PixelFormat;
const RendererBase::FramebufferInfo framebuffer_info{
addr, offset, width, height, stride, static_cast<PixelFormat>(format)};
+
+ Core::System::GetInstance().perf_stats.EndGameFrame();
VideoCore::g_renderer->SwapBuffers(framebuffer_info);
}
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index 26752699e..ad3b56fcc 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -69,7 +69,7 @@ PerfStats::Results PerfStats::GetAndResetStats(u64 current_system_time_us) {
double PerfStats::GetLastFrameTimeScale() {
std::lock_guard<std::mutex> lock(object_mutex);
- constexpr double FRAME_LENGTH = 1.0 / 60; // GPU::SCREEN_REFRESH_RATE;
+ constexpr double FRAME_LENGTH = 1.0 / 60;
return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH;
}