piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #595 from Armada651/pref_log

Browse Source 
FPSCounter: Flush the logs every second and close them when the renderer is shut down.
This commit is contained in:
Dolphin Bot
2014-07-18 12:59:04 +02:00
parent a180cd60ee eaa7460636
commit b9dc69105d
6 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -38,8 +38,6 @@
namespace DX11
{
static int s_fps = 0;
static u32 s_LastAA = 0;
static Television s_television;
@ -181,8 +179,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);
@ -903,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);
}
@ -952,10 +948,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();

7
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -85,7 +85,6 @@ VideoConfig g_ogl_config;
// Declarations and definitions
// ----------------------------
static int s_fps = 0;
static GLuint s_ShowEFBCopyRegions_VBO = 0;
static GLuint s_ShowEFBCopyRegions_VAO = 0;
static SHADER s_ShowEFBCopyRegions;
@ -339,10 +338,8 @@ Renderer::Renderer()
OSDInternalW = 0;
OSDInternalH = 0;
s_fps=0;
s_ShowEFBCopyRegions_VBO = 0;
s_blendMode = 0;
FPSCounter::Initialize();
bool bSuccess = true;
@ -688,7 +685,7 @@ void Renderer::DrawDebugInfo()
std::string debug_info;
if (g_ActiveConfig.bShowFPS)
debug_info += StringFromFormat("FPS: %d\n", s_fps);
debug_info += StringFromFormat("FPS: %d\n", m_fps_counter.m_fps);
if (SConfig::GetInstance().m_ShowLag)
debug_info += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);
@ -1585,8 +1582,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
}
}
if (XFBWrited)
s_fps = FPSCounter::Update();
// ---------------------------------------------------------------------
if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP))
{