mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 19:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move FPSCounter calls to RenderBase.

Browse source
This commit is contained in:
Jules Blok 2014-07-09 23:18:11 +02:00
commit 1754cbda9d
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/VideoCommon/RenderBase.cpp
View file

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