Show call name on glGetError warning messages.

diff --git a/glretrace.hpp b/glretrace.hpp
index 24268fe6d4b2fdb039658ff63b0b3abca3e00db1..7c0ea6bf350e65ad69f9a1979f24a771ae96ca57 100644 (file)
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -54,7 +54,7 @@ extern const char *snapshot_prefix;
 extern unsigned dump_state;
 
 void
-checkGlError(int callIdx = -1);
+checkGlError(const Trace::Call &call);
 
 void retrace_call_glx(Trace::Call &call);
 void retrace_call_wgl(Trace::Call &call);

diff --git a/glretrace.py b/glretrace.py
index d5b254f8537c785e305082aa7e2f2d53f51d126b..9b461608485f993b3e4d62bc8853045fafb63ab8 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -145,7 +145,7 @@ class GlRetracer(Retracer):
             print '    glretrace::insideGlBeginEnd = true;'
         elif function.name.startswith('gl'):
             # glGetError is not allowed inside glBegin/glEnd
-            print '    glretrace::checkGlError(call.no);'
+            print '    glretrace::checkGlError(call);'
 
         if function.name == 'glFlush':
             print '    if (!glretrace::double_buffer) {'

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index 0e9e6bd61b7cac251c574bbac58f8245d2ed9ae0..1867b78bcea64af313426d7b9cedd0938a3970e2 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -53,7 +53,7 @@ const char *snapshot_prefix = NULL;
 unsigned dump_state = ~0;
 
 void
-checkGlError(int callIdx) {
+checkGlError(const Trace::Call &call) {
     if (benchmark || insideGlBeginEnd) {
         return;
     }
@@ -63,11 +63,11 @@ checkGlError(int callIdx) {
         return;
     }
 
-    if (callIdx >= 0) {
-        std::cerr << callIdx << ": ";
-    }
+    std::cerr << call.no << ": ";
+    std::cerr << "warning: glGetError(";
+    std::cerr << call.name();
+    std::cerr << ") = ";
 
-    std::cerr << "warning: glGetError() = ";
     switch (error) {
     case GL_INVALID_ENUM:
         std::cerr << "GL_INVALID_ENUM";
@@ -108,7 +108,6 @@ 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);
 }