Correctly handle profiling of glBegin/glEnd.

diff --git a/retrace/glretrace.py b/retrace/glretrace.py
index fd012d1719a245b5dd99f207e58dbf4d22e62982..be30616d590295705da87b0e4942e27bb69063af 100644 (file)
--- a/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@ -294,7 +294,8 @@ class GlRetracer(Retracer):
             function.name in self.draw_array_function_names or
             function.name in self.draw_elements_function_names or
             function.name in self.draw_indirect_function_names or
-            function.name in self.misc_draw_function_names
+            function.name in self.misc_draw_function_names or
+            function.name == 'glBegin'
         )
 
         if function.name in ('glUseProgram', 'glUseProgramObjectARB'):
@@ -307,8 +308,8 @@ class GlRetracer(Retracer):
         if function.name == 'glEndList':
             print r'    glretrace::insideList = false;'
 
-        if profileDraw:
-            print r'    if (!glretrace::insideList && retrace::profiling) {'
+        if profileDraw and function.name != 'glEnd':
+            print r'    if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
             print r'        glretrace::beginProfile(call);'
             print r'    }'
 
@@ -343,8 +344,8 @@ class GlRetracer(Retracer):
         else:
             Retracer.invokeFunction(self, function)
 
-        if profileDraw:
-            print r'    if (!glretrace::insideList && retrace::profiling) {'
+        if profileDraw or function.name == 'glEnd':
+            print r'    if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
             print r'        glretrace::endProfile(call);'
             print r'    }'