piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

RenderBase: Eliminate renderer global accesses within the Renderer class

Browse Source 
There's no need to access these globals, the instance itself has access
to these data members and functions.
This commit is contained in:
Lioncash 2017-04-08 20:15:37 -04:00
parent caf25653d8
commit cc803db042
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -310,7 +310,7 @@ void Renderer::DrawDebugText()
if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount) if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount)
{ {
if (g_ActiveConfig.bShowFPS) if (g_ActiveConfig.bShowFPS)
final_cyan += StringFromFormat("FPS: %u", g_renderer->m_fps_counter.GetFPS()); final_cyan += StringFromFormat("FPS: %u", m_fps_counter.GetFPS());
if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount) if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount)
final_cyan += " - "; final_cyan += " - ";
@ -439,8 +439,8 @@ void Renderer::DrawDebugText()
final_cyan += Statistics::ToStringProj(); final_cyan += Statistics::ToStringProj();
// and then the text // and then the text
g_renderer->RenderText(final_cyan, 20, 20, 0xFF00FFFF); RenderText(final_cyan, 20, 20, 0xFF00FFFF);
g_renderer->RenderText(final_yellow, 20, 20, 0xFFFFFF00); RenderText(final_yellow, 20, 20, 0xFFFFFF00);
} }
float Renderer::CalculateDrawAspectRatio(int target_width, int target_height) const float Renderer::CalculateDrawAspectRatio(int target_width, int target_height) const
@ -723,10 +723,10 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const
u64 ticks, float Gamma) u64 ticks, float Gamma)
{ {
// TODO: merge more generic parts into VideoCommon // TODO: merge more generic parts into VideoCommon
g_renderer->SwapImpl(xfbAddr, fbWidth, fbStride, fbHeight, rc, ticks, Gamma); SwapImpl(xfbAddr, fbWidth, fbStride, fbHeight, rc, ticks, Gamma);
if (m_xfb_written) if (m_xfb_written)
g_renderer->m_fps_counter.Update(); m_fps_counter.Update();
frameCount++; frameCount++;
GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);