From 1754cbda9d028307443ffd1e3e51ec1849d95ade Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 9 Jul 2014 23:18:11 +0200 Subject: Move FPSCounter calls to RenderBase. --- Source/Core/VideoCommon/RenderBase.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 2c95cdf89d..aa8a9f1d27 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -29,6 +29,7 @@ #include "VideoCommon/CPMemory.h" #include "VideoCommon/Debugger.h" #include "VideoCommon/Fifo.h" +#include "VideoCommon/FPSCounter.h" #include "VideoCommon/FramebufferManagerBase.h" #include "VideoCommon/MainBase.h" #include "VideoCommon/OpcodeDecoding.h" @@ -64,6 +65,8 @@ int Renderer::s_LastEFBScale; bool Renderer::s_skipSwap; bool Renderer::XFBWrited; +unsigned int Renderer::s_fps = 0; + PEControl::PixelFormat Renderer::prev_efb_format = PEControl::INVALID_FMT; unsigned int Renderer::efb_scale_numeratorX = 1; unsigned int Renderer::efb_scale_numeratorY = 1; @@ -84,6 +87,8 @@ Renderer::Renderer() OSDChoice = 0; OSDTime = 0; + + FPSCounter::Initialize(); } Renderer::~Renderer() @@ -521,6 +526,9 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& // TODO: merge more generic parts into VideoCommon g_renderer->SwapImpl(xfbAddr, fbWidth, fbHeight, rc, Gamma); + if (XFBWrited) + s_fps = FPSCounter::Update(); + frameCount++; GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); -- cgit v1.2.3 From 6def4ead01bfcf3b5b12bbb7e16f21217d6088bf Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 9 Jul 2014 22:30:34 +0200 Subject: FPSCounter: Flush the logs every second and close them when the renderer is shut down. --- Source/Core/VideoCommon/RenderBase.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index aa8a9f1d27..68afa4e11a 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -105,6 +105,8 @@ Renderer::~Renderer() if (pFrameDump.IsOpen()) pFrameDump.Close(); #endif + + FPSCounter::Shutdown(); } void Renderer::RenderToXFB(u32 xfbAddr, const EFBRectangle& sourceRc, u32 fbWidth, u32 fbHeight, float Gamma) -- cgit v1.2.3 From 3b978f7c27fe2552e5bfb0e97ef9c82580d8a9d9 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sun, 13 Jul 2014 13:04:25 +0200 Subject: Turn the FPSCounter namespace into a class. --- Source/Core/VideoCommon/RenderBase.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 68afa4e11a..707d918fe9 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -65,8 +65,6 @@ int Renderer::s_LastEFBScale; bool Renderer::s_skipSwap; bool Renderer::XFBWrited; -unsigned int Renderer::s_fps = 0; - PEControl::PixelFormat Renderer::prev_efb_format = PEControl::INVALID_FMT; unsigned int Renderer::efb_scale_numeratorX = 1; unsigned int Renderer::efb_scale_numeratorY = 1; @@ -87,8 +85,6 @@ Renderer::Renderer() OSDChoice = 0; OSDTime = 0; - - FPSCounter::Initialize(); } Renderer::~Renderer() @@ -105,8 +101,6 @@ Renderer::~Renderer() if (pFrameDump.IsOpen()) pFrameDump.Close(); #endif - - FPSCounter::Shutdown(); } void Renderer::RenderToXFB(u32 xfbAddr, const EFBRectangle& sourceRc, u32 fbWidth, u32 fbHeight, float Gamma) @@ -529,7 +523,7 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& g_renderer->SwapImpl(xfbAddr, fbWidth, fbHeight, rc, Gamma); if (XFBWrited) - s_fps = FPSCounter::Update(); + g_renderer->m_fps_counter.Update(); frameCount++; GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); -- cgit v1.2.3