Handle explicit flushes better.

[apitrace] / glretrace_main.cpp

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index c99ed4ac4c9aa3ff896f856cac53c06b24c4f8a0..56113efc60c85d54e34bf88f2eb4337a263a74ed 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -29,6 +29,7 @@
 #include "image.hpp"
 #include "retrace.hpp"
 #include "glproc.hpp"
+#include "glstate.hpp"
 #include "glretrace.hpp"
 
 
@@ -42,8 +43,6 @@ glws::Visual *visual = NULL;
 glws::Drawable *drawable = NULL;
 glws::Context *context = NULL;
 
-int window_width = 256, window_height = 256;
-
 unsigned frame = 0;
 long long startTime = 0;
 bool wait = false;
@@ -55,7 +54,7 @@ const char *snapshot_prefix = NULL;
 unsigned dump_state = ~0;
 
 void
-checkGlError(const Trace::Call &call) {
+checkGlError(Trace::Call &call) {
     if (benchmark || insideGlBeginEnd) {
         return;
     }
@@ -65,6 +64,11 @@ checkGlError(const Trace::Call &call) {
         return;
     }
 
+    if (retrace::verbosity == 0) {
+        std::cout << call;
+        std::cout.flush();
+    }
+
     std::cerr << call.no << ": ";
     std::cerr << "warning: glGetError(";
     std::cerr << call.name();
@@ -103,50 +107,73 @@ checkGlError(const Trace::Call &call) {
 }
 
 
-static void snapshot(Image::Image &image) {
+static void color_snapshot(Image::Image &image) {
     GLint drawbuffer = double_buffer ? GL_BACK : GL_FRONT;
     GLint readbuffer = double_buffer ? GL_BACK : GL_FRONT;
     glGetIntegerv(GL_DRAW_BUFFER, &drawbuffer);
     glGetIntegerv(GL_READ_BUFFER, &readbuffer);
     glReadBuffer(drawbuffer);
+
+    glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+    glPixelStorei(GL_PACK_SWAP_BYTES, GL_FALSE);
+    glPixelStorei(GL_PACK_LSB_FIRST, GL_FALSE);
+    glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+    glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
+    glPixelStorei(GL_PACK_SKIP_ROWS, 0);
+    glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+    glPixelStorei(GL_PACK_SKIP_IMAGES, 0);
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
     glReadPixels(0, 0, image.width, image.height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
+    
+    glPopClientAttrib();
+
     glReadBuffer(readbuffer);
 }
 
 
-void frame_complete(unsigned call_no) {
-    ++frame;
-    
-    if (snapshot_prefix || compare_prefix) {
-        Image::Image *ref = NULL;
-        if (compare_prefix) {
-            char filename[PATH_MAX];
-            snprintf(filename, sizeof filename, "%s%010u.png", compare_prefix, call_no);
-            ref = Image::readPNG(filename);
-            if (!ref) {
-                return;
-            }
-            if (retrace::verbosity >= 0)
-                std::cout << "Read " << filename << "\n";
+void snapshot(unsigned call_no) {
+    if (!drawable ||
+        (!snapshot_prefix && !compare_prefix)) {
+        return;
+    }
+
+    Image::Image *ref = NULL;
+
+    if (compare_prefix) {
+        char filename[PATH_MAX];
+        snprintf(filename, sizeof filename, "%s%010u.png", compare_prefix, call_no);
+        ref = Image::readPNG(filename);
+        if (!ref) {
+            return;
         }
-        
-        Image::Image src(window_width, window_height, true);
-        snapshot(src);
-
-        if (snapshot_prefix) {
-            char filename[PATH_MAX];
-            snprintf(filename, sizeof filename, "%s%010u.png", snapshot_prefix, call_no);
-            if (src.writePNG(filename) && retrace::verbosity >= 0) {
-                std::cout << "Wrote " << filename << "\n";
-            }
+        if (retrace::verbosity >= 0) {
+            std::cout << "Read " << filename << "\n";
         }
+    }
 
-        if (ref) {
-            std::cout << "Snapshot " << call_no << " average precision of " << src.compare(*ref) << " bits\n";
-            delete ref;
+    Image::Image src(drawable->width, drawable->height, true);
+    color_snapshot(src);
+
+    if (snapshot_prefix) {
+        char filename[PATH_MAX];
+        snprintf(filename, sizeof filename, "%s%010u.png", snapshot_prefix, call_no);
+        if (src.writePNG(filename) && retrace::verbosity >= 0) {
+            std::cout << "Wrote " << filename << "\n";
         }
     }
 
+    if (ref) {
+        std::cout << "Snapshot " << call_no << " average precision of " << src.compare(*ref) << " bits\n";
+        delete ref;
+    }
+}
+
+
+void frame_complete(unsigned call_no) {
+    ++frame;
+
+    snapshot(call_no);
 }
 
 
@@ -161,7 +188,10 @@ static void display(void) {
             std::cout.flush();
         }
 
-        if (name[0] == 'w' && name[1] == 'g' && name[2] == 'l') {
+        if (name[0] == 'C' && name[1] == 'G' && name[2] == 'L') {
+            glretrace::retrace_call_cgl(*call);
+        }
+        else if (name[0] == 'w' && name[1] == 'g' && name[2] == 'l') {
             glretrace::retrace_call_wgl(*call);
         }
         else if (name[0] == 'g' && name[1] == 'l' && name[2] == 'X') {
@@ -170,8 +200,10 @@ static void display(void) {
             retrace::retrace_call(*call);
         }
 
-        if (!insideGlBeginEnd && call->no >= dump_state) {
-            state_dump(std::cout);
+        if (!insideGlBeginEnd &&
+            drawable && context &&
+            call->no >= dump_state) {
+            glstate::dumpCurrentContext(std::cout);
             exit(0);
         }
 
@@ -255,10 +287,6 @@ int main(int argc, char **argv)
 
     ws = glws::createNativeWindowSystem();
     visual = ws->createVisual(double_buffer);
-    drawable = ws->createDrawable(visual);
-    drawable->resize(window_width, window_height);
-    context = ws->createContext(visual);
-    ws->makeCurrent(drawable, context);
 
     for ( ; i < argc; ++i) {
         if (parser.open(argv[i])) {