if function.name == 'glEndList':
print r' glretrace::insideList = false;'
- if profileDraw and function.name != 'glEnd':
+ if function.name != 'glEnd':
print r' if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
- print r' glretrace::beginProfile(call);'
+ if profileDraw:
+ print r' glretrace::beginProfile(call, true);'
+ else:
+ print r' glretrace::beginProfile(call, false);'
print r' }'
if function.name == 'glCreateShaderProgramv':
else:
Retracer.invokeFunction(self, function)
- if profileDraw or function.name == 'glEnd':
- print r' if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
- print r' glretrace::endProfile(call);'
- print r' }'
-
- # Error checking
if function.name == "glBegin":
print ' glretrace::insideGlBeginEnd = true;'
- elif function.name.startswith('gl'):
+
+ print r' if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
+ if profileDraw:
+ print r' glretrace::endProfile(call, true);'
+ else:
+ print r' glretrace::endProfile(call, false);'
+ print r' }'
+
+ # Error checking
+ if function.name.startswith('gl'):
# glGetError is not allowed inside glBegin/glEnd
print ' if (retrace::debug && !glretrace::insideGlBeginEnd) {'
print ' glretrace::checkGlError(call);'
and 'program' not in function.argNames():
# Determine the active program for uniforms swizzling
print ' GLint program = -1;'
- print ' GLint pipeline = 0;'
- print ' if (_pipelineHasBeenBound) {'
- print ' glGetIntegerv(GL_PROGRAM_PIPELINE_BINDING, &pipeline);'
- print ' }'
- print ' if (pipeline) {'
- print ' glGetProgramPipelineiv(pipeline, GL_ACTIVE_PROGRAM, &program);'
+ print ' if (glretrace::insideList) {'
+ print ' // glUseProgram & glUseProgramObjectARB are display-list-able'
+ print ' program = _program_map[glretrace::currentContext->activeProgram];'
print ' } else {'
- print ' glGetIntegerv(GL_CURRENT_PROGRAM, &program);'
+ print ' GLint pipeline = 0;'
+ print ' if (_pipelineHasBeenBound) {'
+ print ' glGetIntegerv(GL_PROGRAM_PIPELINE_BINDING, &pipeline);'
+ print ' }'
+ print ' if (pipeline) {'
+ print ' glGetProgramPipelineiv(pipeline, GL_ACTIVE_PROGRAM, &program);'
+ print ' } else {'
+ print ' glGetIntegerv(GL_CURRENT_PROGRAM, &program);'
+ print ' }'
print ' }'
print