From 26c6456c8ea969b8ae9e2de5877ffd70d4f451bc Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 1 Feb 2018 16:17:13 +0000 Subject: [PATCH] Don't query GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS if no subroutines * Works around some mesa debug message spam if no subroutines exist. --- renderdoc/driver/gl/gl_renderstate.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renderdoc/driver/gl/gl_renderstate.cpp b/renderdoc/driver/gl/gl_renderstate.cpp index a66fc146a..03473129e 100644 --- a/renderdoc/driver/gl/gl_renderstate.cpp +++ b/renderdoc/driver/gl/gl_renderstate.cpp @@ -907,6 +907,12 @@ void GLRenderState::FetchState(WrappedOpenGL *gl) if(prog == 0) continue; + GLint numSubroutines = 0; + m_Real->glGetProgramStageiv(prog, shs[s], eGL_ACTIVE_SUBROUTINES, &numSubroutines); + + if(numSubroutines == 0) + continue; + m_Real->glGetProgramStageiv(prog, shs[s], eGL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS, &Subroutines[s].numSubroutines);