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/VideoBackends/D3D/Render.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/Render.cpp') diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index adb9613213..fd56ca3214 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -27,7 +27,6 @@ #include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/Fifo.h" -#include "VideoCommon/FPSCounter.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" @@ -38,8 +37,6 @@ namespace DX11 { -static int s_fps = 0; - static u32 s_LastAA = 0; static Television s_television; @@ -181,8 +178,6 @@ Renderer::Renderer(void *&window_handle) { int x, y, w_temp, h_temp; - FPSCounter::Initialize(); - Host_GetRenderWindowSize(x, y, w_temp, h_temp); D3D::Create((HWND)window_handle); @@ -952,10 +947,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl FramebufferManagerBase::SetLastXfbHeight(h); } - // update FPS counter - if (XFBWrited) - s_fps = FPSCounter::Update(); - // Flip/present backbuffer to frontbuffer here D3D::Present(); -- 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/VideoBackends/D3D/Render.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/D3D/Render.cpp') diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index fd56ca3214..2699b56a46 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -27,6 +27,7 @@ #include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/Fifo.h" +#include "VideoCommon/FPSCounter.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" @@ -898,7 +899,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl // Finish up the current frame, print some stats if (g_ActiveConfig.bShowFPS) { - std::string fps = StringFromFormat("FPS: %d\n", s_fps); + std::string fps = StringFromFormat("FPS: %d\n", m_fps_counter.m_fps); D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps); } -- cgit v1.2.3