Merge branch 'master' into multi-context

[apitrace] / glretrace_main.cpp

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index 6d42cb546e3564645bd512ce56f3b7cd58407dab..9144de6c1ba1580fafde9ab795c3d1a34bce772a 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -42,8 +42,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 +53,7 @@ const char *snapshot_prefix = NULL;
 unsigned dump_state = ~0;
 
 void
-checkGlError(int callIdx) {
+checkGlError(Trace::Call &call) {
     if (benchmark || insideGlBeginEnd) {
         return;
     }
@@ -65,11 +63,16 @@ checkGlError(int callIdx) {
         return;
     }
 
-    if (callIdx >= 0) {
-        std::cerr << callIdx << ": ";
+    if (retrace::verbosity == 0) {
+        std::cout << call;
+        std::cout.flush();
     }
 
-    std::cerr << "warning: glGetError() = ";
+    std::cerr << call.no << ": ";
+    std::cerr << "warning: glGetError(";
+    std::cerr << call.name();
+    std::cerr << ") = ";
+
     switch (error) {
     case GL_INVALID_ENUM:
         std::cerr << "GL_INVALID_ENUM";
@@ -110,15 +113,15 @@ static void snapshot(Image::Image &image) {
     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(unsigned call_no) {
+void frame_complete(unsigned call_no) {
     ++frame;
     
-    if (snapshot_prefix || compare_prefix) {
+    if (drawable &&
+        (snapshot_prefix || compare_prefix)) {
         Image::Image *ref = NULL;
         if (compare_prefix) {
             char filename[PATH_MAX];
@@ -131,7 +134,7 @@ static void frame_complete(unsigned call_no) {
                 std::cout << "Read " << filename << "\n";
         }
         
-        Image::Image src(window_width, window_height, true);
+        Image::Image src(drawable->width, drawable->height, true);
         snapshot(src);
 
         if (snapshot_prefix) {
@@ -157,41 +160,23 @@ static void display(void) {
     while ((call = parser.parse_call())) {
         const std::string &name = call->name();
 
-        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 (retrace::verbosity >= 1) {
-                    std::cout << *call;
-                    std::cout.flush();
-                };
-                frame_complete(call->no);
-                if (double_buffer)
-                    drawable->swapBuffers();
-                else
-                    glFlush();
-            } else if (name == "glXMakeCurrent" ||
-                       name == "wglMakeCurrent") {
-                glFlush();
-                if (!double_buffer) {
-                    frame_complete(call->no);
-                }
-            } else {
-                continue;
-            }
+        if (retrace::verbosity >= 1) {
+            std::cout << *call;
+            std::cout.flush();
         }
 
-        if (name == "glFlush") {
-            glFlush();
-            if (!double_buffer) {
-                frame_complete(call->no);
-            }
+        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') {
+            glretrace::retrace_call_glx(*call);
+        } else {
+            retrace::retrace_call(*call);
         }
-        
-        retrace::retrace_call(*call);
 
-        if (!insideGlBeginEnd && call->no >= dump_state) {
+        if (!insideGlBeginEnd &&
+            drawable && context &&
+            call->no >= dump_state) {
             state_dump(std::cout);
             exit(0);
         }
@@ -276,10 +261,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])) {