From fdbced52928a8826f48505e0161e768d4c9b0e03 Mon Sep 17 00:00:00 2001 From: Baldur Karlsson Date: Tue, 24 Jun 2014 15:54:07 +0100 Subject: [PATCH] glUseProgramStages should always go into pipeline record --- .../driver/gl/wrappers/gl_shader_funcs.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp index 16d36d17b..9bcabdbc2 100644 --- a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp @@ -583,19 +583,12 @@ void WrappedOpenGL::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuin SCOPED_SERIALISE_CONTEXT(USE_PROGRAMSTAGES); Serialise_glUseProgramStages(pipeline, stages, program); - if(m_State == WRITING_CAPFRAME) - { - GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramPipeRes(pipeline)); - RDCASSERT(record); - record->AddChunk(scope.Get()); - - GLResourceRecord *progrecord = GetResourceManager()->GetResourceRecord(ProgramRes(program)); - record->AddParent(progrecord); - } - else - { - m_ContextRecord->AddChunk(scope.Get()); - } + GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramPipeRes(pipeline)); + RDCASSERT(record); + record->AddChunk(scope.Get()); + + GLResourceRecord *progrecord = GetResourceManager()->GetResourceRecord(ProgramRes(program)); + record->AddParent(progrecord); } }