summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Janes <mark.a.janes@intel.com>2017-06-14 16:25:46 -0700
committerMark Janes <mark.a.janes@intel.com>2017-08-28 16:33:55 -0700
commitfc760359b204a87673b14c6d2ad07ec35368fbb1 (patch)
tree593387e87725f72d5ebd2bca20783761ad5a096d
parentd0146c87f065e906c0ac051c299289f5efb85a78 (diff)
glretrace: Always query current program
FrameRetrace may attempt to retrace calls onto modified programs. For example, when a shader is modified, glUniform calls must be executed on the new program. Using a cached currentProgram will generate assert.
-rw-r--r--retrace/glretrace.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/retrace/glretrace.py b/retrace/glretrace.py
index abdc4ec9..39f2a501 100644
--- a/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@ -613,8 +613,7 @@ _getActiveProgram(void)
if (pipeline) {
glGetProgramPipelineiv(pipeline, GL_ACTIVE_PROGRAM, &program);
} else {
- program = currentContext->currentProgram;
- assert(program == _glGetInteger(GL_CURRENT_PROGRAM));
+ program = _glGetInteger(GL_CURRENT_PROGRAM);
}
}
return program;