Dump state after calls, and never inside glBegin/glEnd.

diff --git a/glretrace.py b/glretrace.py
index 450ce7dd19d215648daddaf860321013455f8989..759e9d9984ed802626d76ec6b10faa08915bb494 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -304,11 +304,6 @@ static void display(void) {
     while ((call = parser.parse_call())) {
         const std::string &name = call->name();
 
-        if (call->no == __dump_state) {
-            state_dump(std::cout);
-            exit(0);
-        }
-
         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
@@ -343,6 +338,11 @@ static void display(void) {
         
         retrace_call(*call);
 
+        if (!insideGlBeginEnd && call->no >= __dump_state) {
+            state_dump(std::cout);
+            exit(0);
+        }
+
         delete call;
     }