From bf23fcfc1fc838fd7ee8dc75dce46fbd7f432945 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:43:03 -0400 Subject: [PATCH 1/5] FPSCounter: Don't provide direct access to m_fps --- Source/Core/VideoCommon/FPSCounter.h | 5 +++-- Source/Core/VideoCommon/RenderBase.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index 21539099db..a67939e287 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -11,16 +11,17 @@ class FPSCounter { public: - unsigned int m_fps; - // Initializes the FPS counter. FPSCounter(); // Called when a frame is rendered. Returns the value to be displayed on // screen as the FPS counter (updated every second). int Update(); + + unsigned int GetFPS() const { return m_fps; } private: + unsigned int m_fps; unsigned int m_counter; unsigned int m_fps_last_counter; Common::Timer m_update_time; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 55a6cb8760..a35e3fe94e 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -295,7 +295,7 @@ void Renderer::DrawDebugText() if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount) { if (g_ActiveConfig.bShowFPS) - final_cyan += StringFromFormat("FPS: %d", g_renderer->m_fps_counter.m_fps); + final_cyan += StringFromFormat("FPS: %u", g_renderer->m_fps_counter.GetFPS()); if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount) final_cyan += " - "; From e82b6a8532f97bb7ec13884596b2c518d4413530 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:47:30 -0400 Subject: [PATCH 2/5] FPSCounter: Direct initialize class members --- Source/Core/VideoCommon/FPSCounter.cpp | 3 --- Source/Core/VideoCommon/FPSCounter.h | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index 54817a7c0e..9466ab70a9 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -13,9 +13,6 @@ #define FPS_REFRESH_INTERVAL 1000 FPSCounter::FPSCounter() - : m_fps(0) - , m_counter(0) - , m_fps_last_counter(0) { m_update_time.Update(); m_render_time.Update(); diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index a67939e287..9884444a72 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -21,9 +21,9 @@ public: unsigned int GetFPS() const { return m_fps; } private: - unsigned int m_fps; - unsigned int m_counter; - unsigned int m_fps_last_counter; + unsigned int m_fps = 0; + unsigned int m_counter = 0; + unsigned int m_fps_last_counter = 0; Common::Timer m_update_time; Common::Timer m_render_time; From 55c7754738acf0724f1e77b719b6f84d2dbfb08b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:49:12 -0400 Subject: [PATCH 3/5] FPSCounter: Give the refresh interval a concrete type --- Source/Core/VideoCommon/FPSCounter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index 9466ab70a9..39322d44d7 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -10,7 +10,7 @@ #include "VideoCommon/FPSCounter.h" #include "VideoCommon/VideoConfig.h" -#define FPS_REFRESH_INTERVAL 1000 +static constexpr u64 FPS_REFRESH_INTERVAL = 1000; FPSCounter::FPSCounter() { From 4a981e3a04401d7515440268309f5392648852fd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:57:54 -0400 Subject: [PATCH 4/5] FPSCounter: Change Update's return type to void Its returned value is never used. --- Source/Core/VideoCommon/FPSCounter.cpp | 3 +-- Source/Core/VideoCommon/FPSCounter.h | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index 39322d44d7..64436df5f6 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -26,7 +26,7 @@ void FPSCounter::LogRenderTimeToFile(u64 val) m_bench_file << val << std::endl; } -int FPSCounter::Update() +void FPSCounter::Update() { if (m_update_time.GetTimeDifference() >= FPS_REFRESH_INTERVAL) { @@ -43,5 +43,4 @@ int FPSCounter::Update() } m_counter++; - return m_fps; } diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index 9884444a72..a2ae49567b 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -14,10 +14,9 @@ public: // Initializes the FPS counter. FPSCounter(); - // Called when a frame is rendered. Returns the value to be displayed on - // screen as the FPS counter (updated every second). - int Update(); - + // Called when a frame is rendered (updated every second). + void Update(); + unsigned int GetFPS() const { return m_fps; } private: From d6ff75d71dddb3bec8fbb6e00994440e28041497 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:59:16 -0400 Subject: [PATCH 5/5] OGL: Remove unnecesary FPSCounter include from Render.cpp --- Source/Core/VideoBackends/OGL/Render.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 6481480a3b..12f98691b3 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -41,7 +41,6 @@ #include "VideoCommon/BPStructs.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/Fifo.h" -#include "VideoCommon/FPSCounter.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h"