Output all warnings in the <call no>: <type>: <message> format.

diff --git a/glretrace.hpp b/glretrace.hpp
index a579d58f3aef828595857d666116da24eaf96329..9fa7ae733a91ab1feb5c1c8f2eb5d723b1eab1ca 100644 (file)
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -57,7 +57,7 @@ extern const char *snapshot_prefix;
 extern unsigned dump_state;
 
 void
-checkGlError(void);
+checkGlError(int callIdx = -1);
 
 void state_dump(std::ostream &os);
 

diff --git a/glretrace.py b/glretrace.py
index 0040d580c5cb169c42144e1305d165ee06d2a1ea..345e154f10d0ec7429da792334a1d0156248de43 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -149,7 +149,7 @@ class GlRetracer(Retracer):
             print '    glretrace::insideGlBeginEnd = true;'
         else:
             # glGetError is not allowed inside glBegin/glEnd
-            print '    glretrace::checkGlError();'
+            print '    glretrace::checkGlError(call.no);'
 
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
         if function.name in self.array_pointer_function_names and arg.name == 'pointer':

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index d0fb5789ca314b0a22495e81bc4d2139e92e2d6c..6d42cb546e3564645bd512ce56f3b7cd58407dab 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -55,7 +55,7 @@ const char *snapshot_prefix = NULL;
 unsigned dump_state = ~0;
 
 void
-checkGlError(void) {
+checkGlError(int callIdx) {
     if (benchmark || insideGlBeginEnd) {
         return;
     }
@@ -65,6 +65,10 @@ checkGlError(void) {
         return;
     }
 
+    if (callIdx >= 0) {
+        std::cerr << callIdx << ": ";
+    }
+
     std::cerr << "warning: glGetError() = ";
     switch (error) {
     case GL_INVALID_ENUM:

diff --git a/retrace.py b/retrace.py
index 3a6c0f9cebfe6bfc7e6705f245834183004e9553..4f4505570be6e9a551007db046334debebbd863a 100644 (file)
--- a/retrace.py
+++ b/retrace.py
@@ -269,7 +269,7 @@ class Retracer:
         string_switch('name', func_dict.keys(), handle_case)
 
         print '    if (retrace::verbosity >= 0)'
-        print '        std::cerr << "warning: unknown call " << call.name() << "\\n";'
+        print '        std::cerr << call.no << ": warning: unknown call " << call.name() << "\\n";'
         print '    return false;'
         print '}'
         print