From d38dae5de8ba7a98cc50e73d6c9d9bea5a04a86a Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 3 Jun 2017 18:14:24 +0200 Subject: [PATCH] - Add gpu stat that displays how much time the GPU spent on named GL groups --- src/gl/system/gl_debug.cpp | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/gl/system/gl_debug.cpp b/src/gl/system/gl_debug.cpp index 22bbf597b0..f65b5d3079 100644 --- a/src/gl/system/gl_debug.cpp +++ b/src/gl/system/gl_debug.cpp @@ -29,8 +29,10 @@ #include "gl/system/gl_system.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_debug.h" +#include "stats.h" #include #include +#include #ifndef _MSC_VER #include @@ -46,6 +48,20 @@ CUSTOM_CVAR(Int, gl_debug_level, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN CVAR(Bool, gl_debug_breakpoint, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); +namespace +{ + bool gpuStatActive = false; + bool keepGpuStatActive = false; + std::vector> timeElapsedQueries; + FString gpuStatOutput; +} + +ADD_STAT(gpu) +{ + keepGpuStatActive = true; + return gpuStatOutput; +} + //----------------------------------------------------------------------------- // // Updates OpenGL debugging state @@ -54,6 +70,22 @@ CVAR(Bool, gl_debug_breakpoint, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); void FGLDebug::Update() { + gpuStatOutput = ""; + for (auto &query : timeElapsedQueries) + { + GLuint timeElapsed = 0; + glGetQueryObjectuiv(query.second, GL_QUERY_RESULT, &timeElapsed); + glDeleteQueries(1, &query.second); + + FString out; + out.Format("%s=%04.2f ms\n", query.first.GetChars(), timeElapsed / 1000000.0f); + gpuStatOutput += out; + } + timeElapsedQueries.clear(); + + gpuStatActive = keepGpuStatActive; + keepGpuStatActive = false; + if (!HasDebugApi()) return; @@ -98,6 +130,14 @@ void FGLDebug::PushGroup(const FString &name) { glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, (GLsizei)name.Len(), name.GetChars()); } + + if (gpuStatActive) + { + GLuint queryHandle = 0; + glGenQueries(1, &queryHandle); + glBeginQuery(GL_TIME_ELAPSED, queryHandle); + timeElapsedQueries.push_back({ name, queryHandle }); + } } void FGLDebug::PopGroup() @@ -106,6 +146,11 @@ void FGLDebug::PopGroup() { glPopDebugGroup(); } + + if (gpuStatActive) + { + glEndQuery(GL_TIME_ELAPSED); + } } //-----------------------------------------------------------------------------