Use a vector to dispatch calls when retracing.

[apitrace] / glretrace_main.cpp

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index 3a900927a128a3d6d46ec0055002d03f964f7fe6..80660d777cc0f46ec2167a7458af85c0ac8f9509 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -103,6 +103,37 @@ checkGlError(Trace::Call &call) {
     std::cerr << "\n";
 }
 
+/**
+ * Grow the current drawble.
+ *
+ * We need to infer the drawable size from GL calls because the drawable sizes
+ * are specified by OS specific calls which we do not trace.
+ */
+void
+updateDrawable(int width, int height) {
+    if (!drawable) {
+        return;
+    }
+
+    if (width  <= glretrace::drawable->width &&
+        height <= glretrace::drawable->height) {
+        return;
+    }
+
+    // Check for bound framebuffer last, as this may have a performance impact.
+    GLint draw_framebuffer = 0;
+    glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer);
+    if (draw_framebuffer != 0) {
+        return;
+    }
+
+    glretrace::drawable->resize(width, height);
+    if (!drawable->visible) {
+        drawable->show();
+    }
+    glScissor(0, 0, width, height);
+}
+
 
 void snapshot(unsigned call_no) {
     if (!drawable ||
@@ -163,28 +194,23 @@ void frame_complete(unsigned call_no) {
 
 
 static void display(void) {
+    retrace::Retracer retracer;
+
+    retracer.addCallbacks(gl_callbacks);
+    retracer.addCallbacks(glx_callbacks);
+    retracer.addCallbacks(wgl_callbacks);
+    retracer.addCallbacks(cgl_callbacks);
+
     startTime = OS::GetTime();
     Trace::Call *call;
 
     while ((call = parser.parse_call())) {
-        const char *name = call->name();
-
         if (retrace::verbosity >= 1) {
             std::cout << *call;
             std::cout.flush();
         }
 
-        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') {
-            glretrace::retrace_call_glx(*call);
-        } else {
-            retrace::retrace_call(*call);
-        }
+        retracer.retrace(*call);
 
         if (!insideGlBeginEnd &&
             drawable && context &&