Uniformize the debug messages.

diff --git a/cgltrace.py b/cgltrace.py
index 86e8a299a6c2afe07bd3610e3ec54c4fc9960f81..75da1b6016f90f759c8daf8309bef1f7a6f0473f 100644 (file)
--- a/cgltrace.py
+++ b/cgltrace.py
@@ -106,7 +106,7 @@ static void * __dlsym(const char *symbol)
         }
 
         if (!libgl_handle) {
-            OS::DebugMessage("error: couldn't load %s\n", libgl_filename);
+            OS::DebugMessage("apitrace: error: couldn't load %s\n", libgl_filename);
             OS::Abort();
             return NULL;
         }
@@ -115,7 +115,7 @@ static void * __dlsym(const char *symbol)
     result = dlsym(libgl_handle, symbol);
 
     if (result == dlsym(RTLD_SELF, symbol)) {
-        OS::DebugMessage("error: symbol lookup recursion\n");
+        OS::DebugMessage("apitrace: error: symbol lookup recursion\n");
         OS::Abort();
         return NULL;
     }

diff --git a/glsize.hpp b/glsize.hpp
index 2958c48882cca89f2b6bbd22225fdd30b4e07c34..bd933dc8be409aaf1e53a0bb5d9a42cf53cd3cfe 100644 (file)
--- a/glsize.hpp
+++ b/glsize.hpp
@@ -61,7 +61,7 @@ __gl_type_size(GLenum type)
     case GL_DOUBLE:
         return 8;
     default:
-        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
+        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
         return 0;
     }
 }
@@ -148,7 +148,7 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
             }
         }
     } else {
-        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
+        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, type);
     }
 
     if (__element_array_buffer) {
@@ -179,13 +179,13 @@ __glDrawElementsBaseVertex_maxindex(GLsizei count, GLenum type, const GLvoid *in
 
 static inline GLuint
 __glDrawArraysIndirect_maxindex(const GLvoid *indirect) {
-    OS::DebugMessage("warning: %s: unsupported\n", __FUNCTION__);
+    OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__);
     return 0;
 }
 
 static inline GLuint
 __glDrawElementsIndirect_maxindex(GLenum type, const GLvoid *indirect) {
-    OS::DebugMessage("warning: %s: unsupported\n", __FUNCTION__);
+    OS::DebugMessage("apitrace: warning: %s: unsupported\n", __FUNCTION__);
     return 0;
 }
 
@@ -272,7 +272,7 @@ __glMap1d_size(GLenum target, GLint stride, GLint order)
         channels = 4;
         break;
     default:
-        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target);
+        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target);
         return 0;
     }
 
@@ -312,7 +312,7 @@ __glMap2d_size(GLenum target, GLint ustride, GLint uorder, GLint vstride, GLint
         channels = 4;
         break;
     default:
-        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target);
+        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, target);
         return 0;
     }
 
@@ -403,7 +403,7 @@ __gl_format_channels(GLenum format) {
     case GL_BGRA:
         return 4;
     default:
-        OS::DebugMessage("warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format);
+        OS::DebugMessage("apitrace: warning: %s: unexpected format GLenum 0x%04X\n", __FUNCTION__, format);
         return 0;
     }
 }
@@ -472,7 +472,7 @@ __gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsiz
         bits_per_pixel = 64;
         break;
     default:
-        OS::DebugMessage("warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type);
+        OS::DebugMessage("apitrace: warning: %s: unexpected type GLenum 0x%04X\n", __FUNCTION__, type);
         bits_per_pixel = 0;
         break;
     }

diff --git a/gltrace.py b/gltrace.py
index 667bdc255b74cae74818ec09fae219f23891b2b3..6114feba7b6d763835e724196eaa45c46262e47e 100644 (file)
--- a/gltrace.py
+++ b/gltrace.py
@@ -164,7 +164,7 @@ class GlTracer(Tracer):
             print '    case GL_%s:' % target
             print '        return & __%s_mapping;' % target.lower()
         print '    default:'
-        print '        OS::DebugMessage("warning: unknown buffer target 0x%04X\\n", target);'
+        print '        OS::DebugMessage("apitrace: warning: unknown buffer target 0x%04X\\n", target);'
         print '        return NULL;'
         print '    }'
         print '}'
@@ -211,7 +211,7 @@ class GlTracer(Tracer):
         print '            return num_compressed_texture_formats;'
         print '        }'
         print '    default:'
-        print r'        OS::DebugMessage("warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);'
+        print r'        OS::DebugMessage("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);'
         print '        return 1;'
         print '    }'
         print '}'

diff --git a/glxtrace.py b/glxtrace.py
index cdcef6629f6446404a7cc7a340375c717cf53799..55fafc8ef33efa38a8d4a4ce3b04f01adf3fea63 100644 (file)
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -87,7 +87,7 @@ if __name__ == '__main__':
         print '        %s = (%s)procPtr;' % (pvalue, ptype)
         print '        return (__GLXextFuncPtr)&%s;' % (f.name,)
         print '    }'
-    print '    OS::DebugMessage("apitrace: unknown function \\"%s\\"\\n", (const char *)procName);'
+    print '    OS::DebugMessage("apitrace: warning: unknown function \\"%s\\"\\n", (const char *)procName);'
     print '    return procPtr;'
     print '}'
     print
@@ -111,7 +111,7 @@ static void *__dlopen(const char *filename, int flag)
     if (!dlopen_ptr) {
         dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
         if (!dlopen_ptr) {
-            OS::DebugMessage("error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
+            OS::DebugMessage("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
             return NULL;
         }
     }
@@ -137,7 +137,7 @@ void * dlopen(const char *filename, int flag)
 
     if (filename && handle && !libgl_filename) {
         if (0) {
-            OS::DebugMessage("warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
+            OS::DebugMessage("apitrace: warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
         }
 
         // FIXME: handle absolute paths and other versions
@@ -154,7 +154,7 @@ void * dlopen(const char *filename, int flag)
                 OS::DebugMessage("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
                 handle = __dlopen(info.dli_fname, flag);
             } else {
-                OS::DebugMessage("warning: dladdr() failed\n");
+                OS::DebugMessage("apitrace: warning: dladdr() failed\n");
             }
         }
     }
@@ -201,7 +201,7 @@ static void * __dlsym(const char *symbol)
 
         libgl_handle = __dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
         if (!libgl_handle) {
-            OS::DebugMessage("error: couldn't find libGL.so\n");
+            OS::DebugMessage("apitrace: error: couldn't find libGL.so\n");
             return NULL;
         }
     }

diff --git a/trace_writer.cpp b/trace_writer.cpp
index 700f51188eb13a9e4f0af905ca8cf22b6801cb9c..af8d62f7aee45602d4d8f18e8d7abfe9dda5f34a 100644 (file)
--- a/trace_writer.cpp
+++ b/trace_writer.cpp
@@ -333,7 +333,7 @@ void Writer::writeBitmask(const BitmaskSig *sig, unsigned long long value) {
         _writeUInt(sig->num_flags);
         for (unsigned i = 0; i < sig->num_flags; ++i) {
             if (i != 0 && sig->flags[i].value == 0) {
-                OS::DebugMessage("apitrace: sig %s is zero but is not first flag\n", sig->flags[i].name);
+                OS::DebugMessage("apitrace: warning: sig %s is zero but is not first flag\n", sig->flags[i].name);
             }
             _writeString(sig->flags[i].name);
             _writeUInt(sig->flags[i].value);

diff --git a/wgltrace.py b/wgltrace.py
index ea4474d95fe2e3cc16575c1bbfb122b8f90f85f8..d1b6ccfe0e4446b74718389d2581eb0dccf3e769 100644 (file)
--- a/wgltrace.py
+++ b/wgltrace.py
@@ -53,7 +53,7 @@ class WglTracer(GlTracer):
                 print '    %s = (%s)&%s;' % (instance, function.type, f.name);
         
             def handle_default():
-                print '    OS::DebugMessage("apitrace: unknown function \\"%s\\"\\n", lpszProc);'
+                print '    OS::DebugMessage("apitrace: warning: unknown function \\"%s\\"\\n", lpszProc);'
 
             string_switch('lpszProc', func_dict.keys(), handle_case, handle_default)
             print '    }'