From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 4 May 2011 23:31:01 +0000 (+0100)
Subject: Move glFlush specific code to the retrace function.
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=e4999b9a9f28c62cc3cc809131fc7a1099b10e68;p=apitrace

Move glFlush specific code to the retrace function.
---

diff --git a/glretrace.hpp b/glretrace.hpp
index 9fa7ae7..5fce5dc 100644
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -59,6 +59,8 @@ extern unsigned dump_state;
 void
 checkGlError(int callIdx = -1);
 
+void frame_complete(unsigned call_no);
+
 void state_dump(std::ostream &os);
 
 
diff --git a/glretrace.py b/glretrace.py
index 72931b5..2cb17cd 100644
--- a/glretrace.py
+++ b/glretrace.py
@@ -153,6 +153,11 @@ class GlRetracer(Retracer):
             # glGetError is not allowed inside glBegin/glEnd
             print '    glretrace::checkGlError(call.no);'
 
+        if function.name == 'glFlush':
+            print '    if (!glretrace::double_buffer) {'
+            print '        glretrace::frame_complete(call.no);'
+            print '    }'
+
     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.blob());' % (lvalue, arg_type, rvalue)
diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index a18d1cd..922ec30 100644
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -115,7 +115,7 @@ static void snapshot(Image::Image &image) {
 }
 
 
-static void frame_complete(unsigned call_no) {
+void frame_complete(unsigned call_no) {
     ++frame;
     
     if (snapshot_prefix || compare_prefix) {
@@ -182,13 +182,6 @@ static void display(void) {
             skipCall = true;
         }
 
-        if (name == "glFlush") {
-            glFlush();
-            if (!double_buffer) {
-                frame_complete(call->no);
-            }
-        }
-
         if (!skipCall) {
             retrace::retrace_call(*call);
         }