Use double buffer visuals by default.

[apitrace] / glretrace_main.cpp

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index 9144de6c1ba1580fafde9ab795c3d1a34bce772a..f559332a3850468e5483c4a7a09389bd7c0947d6 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"
 
 
@@ -54,10 +55,6 @@ unsigned dump_state = ~0;
 
 void
 checkGlError(Trace::Call &call) {
-    if (benchmark || insideGlBeginEnd) {
-        return;
-    }
-
     GLenum error = glGetError();
     if (error == GL_NO_ERROR) {
         return;
@@ -106,51 +103,52 @@ checkGlError(Trace::Call &call) {
 }
 
 
-static void 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);
-    glReadPixels(0, 0, image.width, image.height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
-    glReadBuffer(readbuffer);
-}
+void snapshot(unsigned call_no) {
+    if (!drawable ||
+        (!snapshot_prefix && !compare_prefix)) {
+        return;
+    }
 
+    Image::Image *ref = NULL;
 
-void frame_complete(unsigned call_no) {
-    ++frame;
-    
-    if (drawable &&
-        (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";
+    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(drawable->width, drawable->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 = glstate::getDrawBufferImage(GL_RGBA);
+    if (!src) {
+        return;
+    }
+
+    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;
+    }
+
+    delete src;
+}
+
+
+void frame_complete(unsigned call_no) {
+    ++frame;
+
+    snapshot(call_no);
 }
 
 
@@ -158,14 +156,17 @@ static void display(void) {
     Trace::Call *call;
 
     while ((call = parser.parse_call())) {
-        const std::string &name = call->name();
+        const char *name = call->name();
 
         if (retrace::verbosity >= 1) {
             std::cout << *call;
             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') {
@@ -177,7 +178,7 @@ static void display(void) {
         if (!insideGlBeginEnd &&
             drawable && context &&
             call->no >= dump_state) {
-            state_dump(std::cout);
+            glstate::dumpCurrentContext(std::cout);
             exit(0);
         }
 
@@ -210,9 +211,10 @@ static void usage(void) {
         "Usage: glretrace [OPTION] TRACE\n"
         "Replay TRACE.\n"
         "\n"
-        "  -b           benchmark (no glgeterror; no messages)\n"
+        "  -b           benchmark mode (no error checking or warning messages)\n"
         "  -c PREFIX    compare against snapshots\n"
-        "  -db          use a double buffer visual\n"
+        "  -db          use a double buffer visual (default)\n"
+        "  -sb          use a single buffer visual\n"
         "  -s PREFIX    take snapshots\n"
         "  -v           verbose output\n"
         "  -D CALLNO    dump state at specific call no\n"
@@ -243,6 +245,8 @@ int main(int argc, char **argv)
             retrace::verbosity = -2;
         } else if (!strcmp(arg, "-db")) {
             double_buffer = true;
+        } else if (!strcmp(arg, "-sb")) {
+            double_buffer = false;
         } else if (!strcmp(arg, "--help")) {
             usage();
             return 0;