Turn the FPSCounter namespace into a class.

This commit is contained in:
Jules Blok
2014-07-13 13:04:25 +02:00
parent 6def4ead01
commit 3b978f7c27
6 changed files with 53 additions and 57 deletions

View File

@ -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);