diff --git a/Common/GPU/OpenGL/GLFrameData.h b/Common/GPU/OpenGL/GLFrameData.h index 2e7e65f417..eb3a422e59 100644 --- a/Common/GPU/OpenGL/GLFrameData.h +++ b/Common/GPU/OpenGL/GLFrameData.h @@ -41,6 +41,7 @@ struct GLQueueProfileContext { double cpuStartTime; double cpuEndTime; std::string passesString; + int commandCounts[25]; // Can't grab count from the enum as it would mean a circular include. Might clean this up later. }; diff --git a/Common/GPU/OpenGL/GLQueueRunner.cpp b/Common/GPU/OpenGL/GLQueueRunner.cpp index 48ab0a2140..f17708b2d5 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.cpp +++ b/Common/GPU/OpenGL/GLQueueRunner.cpp @@ -713,9 +713,9 @@ void GLQueueRunner::RunSteps(const std::vector &steps, GLFrameData &f if (IsVREnabled()) { GLRStep &vrStep = step; PreprocessStepVR(&vrStep); - PerformRenderPass(vrStep, renderCount == 1, renderCount == totalRenderCount); + PerformRenderPass(vrStep, renderCount == 1, renderCount == totalRenderCount, frameData.profile); } else { - PerformRenderPass(step, renderCount == 1, renderCount == totalRenderCount); + PerformRenderPass(step, renderCount == 1, renderCount == totalRenderCount, frameData.profile); } break; case GLRStepType::COPY: @@ -794,7 +794,7 @@ static void EnableDisableVertexArrays(uint32_t prevAttr, uint32_t newAttr) { } } -void GLQueueRunner::PerformRenderPass(const GLRStep &step, bool first, bool last) { +void GLQueueRunner::PerformRenderPass(const GLRStep &step, bool first, bool last, GLQueueProfileContext &profile) { CHECK_GL_ERROR_IF_DEBUG(); PerformBindFramebufferAsRenderTarget(step); @@ -869,6 +869,13 @@ void GLQueueRunner::PerformRenderPass(const GLRStep &step, bool first, bool last CHECK_GL_ERROR_IF_DEBUG(); auto &commands = step.commands; for (const auto &c : commands) { +#ifdef _DEBUG + if (profile.enabled) { + if ((size_t)c.cmd < ARRAY_SIZE(profile.commandCounts)) { + profile.commandCounts[(size_t)c.cmd]++; + } + } +#endif switch (c.cmd) { case GLRRenderCommand::DEPTH: if (c.depth.enabled) { @@ -1887,3 +1894,33 @@ const char *GLRAspectToString(GLRAspect aspect) { default: return "N/A"; } } + +const char *RenderCommandToString(GLRRenderCommand cmd) { + switch (cmd) { + case GLRRenderCommand::DEPTH: return "DEPTH"; + case GLRRenderCommand::STENCIL: return "STENCIL"; + case GLRRenderCommand::BLEND: return "BLEND"; + case GLRRenderCommand::BLENDCOLOR: return "BLENDCOLOR"; + case GLRRenderCommand::LOGICOP: return "LOGICOP"; + case GLRRenderCommand::UNIFORM4I: return "UNIFORM4I"; + case GLRRenderCommand::UNIFORM4UI: return "UNIFORM4UI"; + case GLRRenderCommand::UNIFORM4F: return "UNIFORM4F"; + case GLRRenderCommand::UNIFORMMATRIX: return "UNIFORMMATRIX"; + case GLRRenderCommand::UNIFORMSTEREOMATRIX: return "UNIFORMSTEREOMATRIX"; + case GLRRenderCommand::TEXTURESAMPLER: return "TEXTURESAMPLER"; + case GLRRenderCommand::TEXTURELOD: return "TEXTURELOD"; + case GLRRenderCommand::VIEWPORT: return "VIEWPORT"; + case GLRRenderCommand::SCISSOR: return "SCISSOR"; + case GLRRenderCommand::RASTER: return "RASTER"; + case GLRRenderCommand::CLEAR: return "CLEAR"; + case GLRRenderCommand::INVALIDATE: return "INVALIDATE"; + case GLRRenderCommand::BINDPROGRAM: return "BINDPROGRAM"; + case GLRRenderCommand::BINDTEXTURE: return "BINDTEXTURE"; + case GLRRenderCommand::BIND_FB_TEXTURE: return "BIND_FB_TEXTURE"; + case GLRRenderCommand::BIND_VERTEX_BUFFER: return "BIND_VERTEX_BUFFER"; + case GLRRenderCommand::GENMIPS: return "GENMIPS"; + case GLRRenderCommand::DRAW: return "DRAW"; + case GLRRenderCommand::TEXTURE_SUBIMAGE: return "TEXTURE_SUBIMAGE"; + default: return "N/A"; + } +} diff --git a/Common/GPU/OpenGL/GLQueueRunner.h b/Common/GPU/OpenGL/GLQueueRunner.h index ac30fa3082..df86b9565f 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.h +++ b/Common/GPU/OpenGL/GLQueueRunner.h @@ -379,7 +379,7 @@ private: void InitCreateFramebuffer(const GLRInitStep &step); void PerformBindFramebufferAsRenderTarget(const GLRStep &pass); - void PerformRenderPass(const GLRStep &pass, bool first, bool last); + void PerformRenderPass(const GLRStep &pass, bool first, bool last, GLQueueProfileContext &profile); void PerformCopy(const GLRStep &pass); void PerformBlit(const GLRStep &pass); void PerformReadback(const GLRStep &pass); @@ -423,3 +423,5 @@ private: ErrorCallbackFn errorCallback_ = nullptr; void *errorCallbackUserData_ = nullptr; }; + +const char *RenderCommandToString(GLRRenderCommand cmd); diff --git a/Common/GPU/OpenGL/GLRenderManager.cpp b/Common/GPU/OpenGL/GLRenderManager.cpp index e823af2608..1e06d2ac83 100644 --- a/Common/GPU/OpenGL/GLRenderManager.cpp +++ b/Common/GPU/OpenGL/GLRenderManager.cpp @@ -351,10 +351,6 @@ void GLRenderManager::BeginFrame(bool enableProfiling) { GLFrameData &frameData = frameData_[curFrame]; frameData.profile.enabled = enableProfiling; - if (frameData.profile.enabled) { - profilePassesString_ = std::move(frameData.profile.passesString); - frameData.profile.passesString.clear(); - } { VLOG("PUSH: BeginFrame (curFrame = %d, readyForFence = %d, time=%0.3f)", curFrame, (int)frameData.readyForFence, time_now_d()); @@ -394,6 +390,23 @@ void GLRenderManager::Finish() { pushCondVar_.notify_one(); } + if (frameData.profile.enabled) { + profilePassesString_ = std::move(frameData.profile.passesString); + +#ifdef _DEBUG + std::string cmdString; + for (int i = 0; i < ARRAY_SIZE(frameData.profile.commandCounts); i++) { + if (frameData.profile.commandCounts[i] > 0) { + cmdString += StringFromFormat("%s: %d\n", RenderCommandToString((GLRRenderCommand)i), frameData.profile.commandCounts[i]); + } + } + memset(frameData.profile.commandCounts, 0, sizeof(frameData.profile.commandCounts)); + profilePassesString_ = cmdString + profilePassesString_; +#endif + + frameData.profile.passesString.clear(); + } + curFrame_++; if (curFrame_ >= inflightFrames_) curFrame_ = 0;