]> git.cworth.org Git - apitrace/blobdiff - glretrace.py
Abstract retracing into a class of its own.
[apitrace] / glretrace.py
index a66d5d2bbc86a4a20e55d71ecef252054a7e7870..fd1460a550444ec0048b1990fd06165cfa205c71 100644 (file)
@@ -37,6 +37,36 @@ class GlRetracer(Retracer):
     def retrace_function(self, function):
         Retracer.retrace_function(self, function)
 
+    array_pointer_function_names = set((
+        "glVertexPointer",
+        "glNormalPointer",
+        "glColorPointer",
+        "glIndexPointer",
+        "glTexCoordPointer",
+        "glEdgeFlagPointer",
+        "glFogCoordPointer",
+        "glSecondaryColorPointer",
+
+        "glInterleavedArrays",
+
+        #"glVertexPointerEXT",
+        #"glNormalPointerEXT",
+        #"glColorPointerEXT",
+        #"glIndexPointerEXT",
+        #"glTexCoordPointerEXT",
+        #"glEdgeFlagPointerEXT",
+        #"glFogCoordPointerEXT",
+        #"glSecondaryColorPointerEXT",
+
+        "glVertexAttribPointer",
+        "glVertexAttribPointerARB",
+        "glVertexAttribPointerNV",
+        "glVertexAttribLPointer",
+        "glVertexAttribLPointerEXT",
+        
+        #"glMatrixIndexPointerARB",
+    ))
+
     draw_array_function_names = set([
         "glDrawArrays",
         "glDrawArraysEXT",
@@ -61,28 +91,39 @@ class GlRetracer(Retracer):
         "glDrawRangeElements",
         "glDrawRangeElementsBaseVertex",
         "glDrawRangeElementsEXT",
-        "glMultiDrawElements",
-        "glMultiDrawElementsBaseVertex",
-        "glMultiDrawElementsEXT",
-        "glMultiModeDrawElementsIBM",
+        #"glMultiDrawElements",
+        #"glMultiDrawElementsBaseVertex",
+        #"glMultiDrawElementsEXT",
+        #"glMultiModeDrawElementsIBM",
     ])
 
-    def call_function(self, function):
-        if (function.name in self.draw_array_function_names or 
-            function.name in self.draw_elements_function_names):
-            print '    GLint __array_buffer = 0;'
-            print '    glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &__array_buffer);'
-            print '    if (!__array_buffer) {'
-            self.fail_function(function)
+    def retrace_function_body(self, function):
+        is_array_pointer = function.name in self.array_pointer_function_names
+        is_draw_array = function.name in self.draw_array_function_names
+        is_draw_elements = function.name in self.draw_elements_function_names
+
+        if is_array_pointer or is_draw_array or is_draw_elements:
+            print '    if (Trace::Parser::version < 1) {'
+
+            if is_array_pointer or is_draw_array:
+                print '        GLint __array_buffer = 0;'
+                print '        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &__array_buffer);'
+                print '        if (!__array_buffer) {'
+                self.fail_function(function)
+                print '        }'
+
+            if is_draw_elements:
+                print '        GLint __element_array_buffer = 0;'
+                print '        glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer);'
+                print '        if (!__element_array_buffer) {'
+                self.fail_function(function)
+                print '        }'
+            
             print '    }'
 
-        if function.name in self.draw_elements_function_names:
-            print '    GLint __element_array_buffer = 0;'
-            print '    glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer);'
-            print '    if (!__element_array_buffer) {'
-            self.fail_function(function)
-            print '    }'
+        Retracer.retrace_function_body(self, function)
 
+    def call_function(self, function):
         if function.name == "glViewport":
             print '    if (x + width > __window_width) {'
             print '        __window_width = x + width;'
@@ -104,38 +145,13 @@ class GlRetracer(Retracer):
             # glGetError is not allowed inside glBegin/glEnd
             print '    checkGlError();'
 
-    pointer_function_names = set([
-        "glColorPointer",
-        "glColorPointerEXT",
-        "glEdgeFlagPointer",
-        "glEdgeFlagPointerEXT",
-        "glFogCoordPointer",
-        "glFogCoordPointerEXT",
-        "glIndexPointer",
-        "glIndexPointerEXT",
-        "glMatrixIndexPointerARB",
-        "glNormalPointer",
-        "glNormalPointerEXT",
-        "glSecondaryColorPointer",
-        "glSecondaryColorPointerEXT",
-        "glTexCoordPointer",
-        "glTexCoordPointerEXT",
-        "glVertexAttribLPointer",
-        "glVertexAttribPointer",
-        "glVertexAttribPointerARB",
-        "glVertexAttribPointerNV",
-        "glVertexPointer",
-        "glVertexPointerEXT",
-    ])
-
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
-        if (function.name in self.pointer_function_names and arg.name == 'pointer' or
-            function.name in self.draw_elements_function_names and arg.name == 'indices'):
-            print '    if (dynamic_cast<Trace::Null *>(&%s)) {' % rvalue
-            print '        %s = 0;' % (lvalue)
-            print '    } else {'
-            print '        %s = (%s)(uintptr_t)(%s);' % (lvalue, arg_type, rvalue)
-            print '    }'
+        if function.name in self.array_pointer_function_names and arg.name == 'pointer':
+            print '    %s = %s.blob();' % (lvalue, rvalue)
+            return
+
+        if function.name in self.draw_elements_function_names and arg.name == 'indices':
+            print '    %s = %s.blob();' % (lvalue, rvalue)
             return
 
         if function.name.startswith('glUniform') and function.args[0].name == arg.name == 'location':
@@ -151,7 +167,11 @@ if __name__ == '__main__':
 #include <stdio.h>
 #include <iostream>
 
+#define RETRACE
+
 #include "glproc.hpp"
+#include "glstate.hpp"
+
 #include <GL/glut.h>
 
 static bool double_buffer = false;
@@ -162,18 +182,18 @@ bool __reshape_window = false;
 
 unsigned __frame = 0;
 long long __startTime = 0;
-static enum {
-    MODE_DISPLAY = 0,
-    MODE_SNAPSHOT,
-    MODE_COMPARE,
-} __mode = MODE_DISPLAY;
+bool __wait = false;
+
+bool __benchmark = false;
+const char *__compare_prefix = NULL;
+const char *__snapshot_prefix = NULL;
 
-const char *__snapshot_prefix = "";
+unsigned __dump_state = ~0;
 
 
 static void
 checkGlError(void) {
-    if (insideGlBeginEnd) {
+    if (__benchmark || insideGlBeginEnd) {
         return;
     }
 
@@ -227,34 +247,45 @@ static void display_noop(void) {
 
 #include "image.hpp"
 
+static void snapshot(Image::Image &image) {
+    GLint drawbuffer = double_buffer ? GL_BACK : GL_FRONT;
+    GLint readbuffer = double_buffer ? GL_BACK : GL_FRONT;
+    glGetIntegerv(GL_READ_BUFFER, &drawbuffer);
+    glGetIntegerv(GL_READ_BUFFER, &readbuffer);
+    glReadBuffer(drawbuffer);
+    glReadPixels(0, 0, image.width, image.height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
+    checkGlError();
+    glReadBuffer(readbuffer);
+}
+
 static void frame_complete(void) {
     ++__frame;
     
-    if (!__reshape_window && (__mode == MODE_SNAPSHOT || __mode == MODE_COMPARE)) {
-        char filename[PATH_MAX];
-
-        snprintf(filename, sizeof filename, "%s%04u.png", __snapshot_prefix, __frame);
-        
-        Image::Image *ref;
-        if (__mode == MODE_COMPARE) {
+    if (!__reshape_window && (__snapshot_prefix || __compare_prefix)) {
+        Image::Image *ref = NULL;
+        if (__compare_prefix) {
+            char filename[PATH_MAX];
+            snprintf(filename, sizeof filename, "%s%04u.png", __compare_prefix, __frame);
             ref = Image::readPNG(filename);
             if (!ref) {
                 return;
             }
-            if (verbosity)
+            if (verbosity >= 0)
                 std::cout << "Read " << filename << "\n";
         }
         
         Image::Image src(__window_width, __window_height, true);
-        glReadPixels(0, 0, __window_width, __window_height, GL_RGBA, GL_UNSIGNED_BYTE, src.pixels);
+        snapshot(src);
 
-        if (__mode == MODE_SNAPSHOT) {
-            if (src.writePNG(filename) && verbosity) {
+        if (__snapshot_prefix) {
+            char filename[PATH_MAX];
+            snprintf(filename, sizeof filename, "%s%04u.png", __snapshot_prefix, __frame);
+            if (src.writePNG(filename) && verbosity >= 0) {
                 std::cout << "Wrote " << filename << "\n";
             }
         }
 
-        if (__mode == MODE_COMPARE) {
+        if (ref) {
             std::cout << "Frame " << __frame << " average precision of " << src.compare(*ref) << " bits\n";
             delete ref;
         }
@@ -266,24 +297,55 @@ static void display(void) {
     Trace::Call *call;
 
     while ((call = parser.parse_call())) {
-        if (call->name() == "glFlush") {
-            glFlush();
-            if (!double_buffer) {
-                frame_complete();
-            }
+        const std::string &name = call->name();
+
+        if (call->no == __dump_state) {
+            state_dump(std::cout);
+            exit(0);
         }
-        
-        if (!retrace_call(*call)) {
-            if (call->name() == "glXSwapBuffers" ||
-                call->name() == "wglSwapBuffers") {
+
+        if ((name[0] == 'w' && name[1] == 'g' && name[2] == 'l') ||
+            (name[0] == 'g' && name[1] == 'l' && name[2] == 'X')) {
+            // XXX: We ignore the majority of the OS-specific calls for now
+            if (name == "glXSwapBuffers" ||
+                name == "wglSwapBuffers") {
+                if (verbosity >= 1) {
+                    std::cout << *call;
+                    std::cout.flush();
+                };
+                frame_complete();
                 if (double_buffer)
                     glutSwapBuffers();
                 else
                     glFlush();
-                frame_complete();
+
+                // Return now to allow GLUT to resize the window.
+                delete call;
                 return;
+            } else if (name == "glXMakeCurrent" ||
+                       name == "wglMakeCurrent") {
+                glFlush();
+                if (!double_buffer) {
+                    frame_complete();
+                    // Return now to allow GLUT to resize window.
+                    delete call;
+                    return;
+                }
+            } else {
+                continue;
+            }
+        }
+
+        if (name == "glFlush") {
+            glFlush();
+            if (!double_buffer) {
+                frame_complete();
             }
         }
+        
+        retrace_call(*call);
+
+        delete call;
     }
 
     // Reached the end of trace
@@ -292,12 +354,14 @@ static void display(void) {
     long long endTime = OS::GetTime();
     float timeInterval = (endTime - __startTime) * 1.0E-6;
 
-    std::cout << 
-        "Rendered " << __frame << " frames"
-        " in " <<  timeInterval << " secs,"
-        " average of " << (__frame/timeInterval) << " fps\n";
+    if (verbosity >= -1) { 
+        std::cout << 
+            "Rendered " << __frame << " frames"
+            " in " <<  timeInterval << " secs,"
+            " average of " << (__frame/timeInterval) << " fps\n";
+    }
 
-    if (__mode == MODE_DISPLAY) {
+    if (__wait) {
         glutDisplayFunc(&display_noop);
         glutIdleFunc(NULL);
     } else {
@@ -319,11 +383,13 @@ static void usage(void) {
         "Usage: glretrace [OPTION] TRACE\n"
         "Replay TRACE.\n"
         "\n"
-        "  -c           compare against snapshots\n"
+        "  -b           benchmark (no glgeterror; no messages)\n"
+        "  -c PREFIX    compare against snapshots\n"
         "  -db          use a double buffer visual\n"
-        "  -p PREFIX    snapshot prefix\n"
-        "  -s           take snapshots\n"
-        "  -v           verbose output\n";
+        "  -s PREFIX    take snapshots\n"
+        "  -v           verbose output\n"
+        "  -D CALLNO    dump state at specific call no\n"
+        "  -w           wait on final frame\n";
 }
 
 int main(int argc, char **argv)
@@ -339,19 +405,25 @@ int main(int argc, char **argv)
 
         if (!strcmp(arg, "--")) {
             break;
+        } else if (!strcmp(arg, "-b")) {
+            __benchmark = true;
+            verbosity = -1;
         } else if (!strcmp(arg, "-c")) {
-            __mode = MODE_COMPARE;
+            __compare_prefix = argv[++i];
+        } else if (!strcmp(arg, "-D")) {
+            __dump_state = atoi(argv[++i]);
+            verbosity = -2;
         } else if (!strcmp(arg, "-db")) {
             double_buffer = true;
         } else if (!strcmp(arg, "--help")) {
             usage();
             return 0;
-        } else if (!strcmp(arg, "-p")) {
-            __snapshot_prefix = argv[++i];
         } else if (!strcmp(arg, "-s")) {
-            __mode = MODE_SNAPSHOT;
+            __snapshot_prefix = argv[++i];
         } else if (!strcmp(arg, "-v")) {
             ++verbosity;
+        } else if (!strcmp(arg, "-w")) {
+            __wait = true;
         } else {
             std::cerr << "error: unknown option " << arg << "\n";
             usage();