From cbd225f575a0b92a293513223c4c9a74d2d4f8ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 9 Jun 2011 00:07:18 +0100 Subject: [PATCH] Uniformize the debug messages. --- cgltrace.py | 4 ++-- glsize.hpp | 16 ++++++++-------- gltrace.py | 4 ++-- glxtrace.py | 10 +++++----- trace_writer.cpp | 2 +- wgltrace.py | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cgltrace.py b/cgltrace.py index 86e8a29..75da1b6 100644 --- 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 2958c48..bd933dc 100644 --- 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 667bdc2..6114feb 100644 --- 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 cdcef66..55fafc8 100644 --- 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 700f511..af8d62f 100644 --- 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 ea4474d..d1b6ccf 100644 --- 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 ' }' -- 2.45.2