Fix and cleanup state lookups on frames.

[apitrace] / glretrace.py

diff --git a/glretrace.py b/glretrace.py
index 5d58b2d58faa9f7509320fc290d249b140d2684d..b6dac924ef5b4e350f2ee0321c81fae96696eb15 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -170,6 +170,12 @@ class GlRetracer(Retracer):
             print '    GLint __pack_buffer = 0;'
             print '    glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING, &__pack_buffer);'
             print '    if (!__pack_buffer) {'
+            if function.name == 'glReadPixels':
+                print '    glFinish();'
+                print '    if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAME ||'
+                print '        glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {'
+                print '        glretrace::snapshot(call.no);'
+                print '    }'
             print '        return;'
             print '    }'
 
@@ -178,6 +184,9 @@ class GlRetracer(Retracer):
             print '    if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {'
             print '        glretrace::snapshot(call.no - 1);'
             print '    }'
+        if function.name == 'glFrameTerminatorGREMEDY':
+            print '    glretrace::frame_complete(call.no);'
+            return
 
         Retracer.retrace_function_body(self, function)
 
@@ -186,12 +195,6 @@ class GlRetracer(Retracer):
             print '    if (!glretrace::double_buffer) {'
             print '        glretrace::frame_complete(call.no);'
             print '    }'
-        if function.name == 'glReadPixels':
-            print '    glFinish();'
-            print '    if (glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAME ||'
-            print '        glretrace::snapshot_frequency == glretrace::FREQUENCY_FRAMEBUFFER) {'
-            print '        glretrace::snapshot(call.no);'
-            print '    }'
         if is_draw_array or is_draw_elements or is_misc_draw:
             print '    if (glretrace::snapshot_frequency == glretrace::FREQUENCY_DRAW) {'
             print '        glretrace::snapshot(call.no);'
@@ -200,16 +203,20 @@ class GlRetracer(Retracer):
 
     def call_function(self, function):
         if function.name == "glViewport":
-            print '    if (glretrace::drawable) {'
-            print '        int drawable_width  = x + width;'
-            print '        int drawable_height = y + height;'
-            print '        if (drawable_width  > (int)glretrace::drawable->width ||'
-            print '            drawable_height > (int)glretrace::drawable->height) {'
-            print '            glretrace::drawable->resize(drawable_width, drawable_height);'
-            print '            if (!glretrace::drawable->visible) {'
-            print '                glretrace::drawable->show();'
+            print '    GLint draw_framebuffer = 0;'
+            print '    glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer);'
+            print '    if (draw_framebuffer == 0) {'
+            print '        if (glretrace::drawable) {'
+            print '            int drawable_width  = x + width;'
+            print '            int drawable_height = y + height;'
+            print '            if (drawable_width  > (int)glretrace::drawable->width ||'
+            print '                drawable_height > (int)glretrace::drawable->height) {'
+            print '                glretrace::drawable->resize(drawable_width, drawable_height);'
+            print '                if (!glretrace::drawable->visible) {'
+            print '                    glretrace::drawable->show();'
+            print '                }'
+            print '                glScissor(0, 0, drawable_width, drawable_height);'
             print '            }'
-            print '            glScissor(0, 0, drawable_width, drawable_height);'
             print '        }'
             print '    }'
 
@@ -298,7 +305,7 @@ class GlRetracer(Retracer):
 
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
         if function.name in self.array_pointer_function_names and arg.name == 'pointer':
-            print '    %s = static_cast<%s>(%s.toPointer());' % (lvalue, arg_type, rvalue)
+            print '    %s = static_cast<%s>(%s.toPointer(true));' % (lvalue, arg_type, rvalue)
             return
 
         if function.name in self.draw_elements_function_names and arg.name == 'indices':