diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-07-09 23:18:11 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-07-10 23:11:09 +0200 |
| commit | 1754cbda9d028307443ffd1e3e51ec1849d95ade (patch) | |
| tree | 3d96d47cdc8b22e020bbac3d3b8d9b0338c0fe2e /Source/Core/VideoCommon/RenderBase.cpp | |
| parent | a546ef3276f4533f489a6381219199312e63f5df (diff) | |
Move FPSCounter calls to RenderBase.
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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); |