Merge remote-tracking branch 'github/master' into profile-gui

[apitrace] / retrace / glretrace.py

diff --git a/retrace/glretrace.py b/retrace/glretrace.py
index 879f3e4b786118ca5d46dde56b4670739e025bc2..987798fe6a0c5cab01eb015a93ef62f708a50aea 100644 (file)
--- a/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@ -346,15 +346,16 @@ class GlRetracer(Retracer):
         else:
             Retracer.invokeFunction(self, function)
 
+        if function.name == "glBegin":
+            print '    glretrace::insideGlBeginEnd = true;'
+
         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'):
+        if function.name.startswith('gl'):
             # glGetError is not allowed inside glBegin/glEnd
             print '    if (retrace::debug && !glretrace::insideGlBeginEnd) {'
             print '        glretrace::checkGlError(call);'