summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/Render.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/Render.cpp19
1 files changed, 17 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 052f6c0444..ba49db732a 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -709,8 +709,23 @@ void Renderer::DrawDebugInfo()
// Draw various messages on the screen, like FPS, statistics, etc.
std::string debug_info;
- if (g_ActiveConfig.bShowFPS)
- debug_info += StringFromFormat("FPS: %d\n", m_fps_counter.m_fps);
+ if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount)
+ {
+ std::string fps = "";
+ if (g_ActiveConfig.bShowFPS)
+ debug_info += StringFromFormat("FPS: %d", m_fps_counter.m_fps);
+
+ if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount)
+ debug_info += " - ";
+ if (SConfig::GetInstance().m_ShowFrameCount)
+ {
+ debug_info += StringFromFormat("Frame: %d", Movie::g_currentFrame);
+ if (Movie::IsPlayingInput())
+ debug_info += StringFromFormat(" / %d", Movie::g_totalFrames);
+ }
+
+ debug_info += "\n";
+ }
if (SConfig::GetInstance().m_ShowLag)
debug_info += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);