Filter verbose calls on glretrace too.

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index 89021f14f4ee6644cb705dc54c0c003aee57619c..978a34eef38b2f9b9811abf59b819a7354ad372f 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -259,7 +259,7 @@ static void usage(void) {
         "  -sb          use a single buffer visual\n"
         "  -s PREFIX    take snapshots; `-` for PNM stdout output\n"
         "  -S FREQUENCY snapshot frequency: frame (default), framebuffer, or draw\n"
-        "  -v           verbose output\n"
+        "  -v           increase output verbosity\n"
         "  -D CALLNO    dump state at specific call no\n"
         "  -w           wait on final frame\n";
 }

diff --git a/retrace.cpp b/retrace.cpp
index 412c73b8061e6ecd975ecc32581250dcb7fe8440..795d039a11ad464252d4643f6fb466fdfd093085 100644 (file)
--- a/retrace.cpp
+++ b/retrace.cpp
@@ -84,7 +84,10 @@ void Retracer::retrace(trace::Call &call) {
     call_dumped = false;
 
     if (verbosity >= 1) {
-        dumpCall(call);
+        if (verbosity >= 2 ||
+            !(call.flags & trace::CALL_FLAG_VERBOSE)) {
+            dumpCall(call);
+        }
     }
 
     Callback callback = 0;