X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxtrace.py;h=3e91f00ed47e1bed2418a78deaa6e9f88abc8695;hb=68f7c981ac5dedf2084d617f079f290edb6693cb;hp=7511f0a392ac7afc53acaa6a758c5cbc63b72c62;hpb=96595ba7e5fc4f17bce6cb8e9690f05d231dd138;p=apitrace

diff --git a/glxtrace.py b/glxtrace.py
index 7511f0a..3e91f00 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -28,9 +28,9 @@
 """GLX tracing generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from glxapi import glxapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.glxapi import glxapi
 from gltrace import GlTracer
 from dispatch import function_pointer_type, function_pointer_value
 
@@ -101,11 +101,11 @@ if __name__ == '__main__':
     for f in api.functions:
         ptype = function_pointer_type(f)
         pvalue = function_pointer_value(f)
-        print '    if (!strcmp("%s", (const char *)procName)) {' % f.name
+        print '    if (strcmp("%s", (const char *)procName) == 0) {' % f.name
         print '        %s = (%s)procPtr;' % (pvalue, ptype)
         print '        return (__GLXextFuncPtr)&%s;' % (f.name,)
         print '    }'
-    print '    OS::DebugMessage("apitrace: warning: unknown function \\"%s\\"\\n", (const char *)procName);'
+    print '    os::log("apitrace: warning: unknown function \\"%s\\"\\n", (const char *)procName);'
     print '    return procPtr;'
     print '}'
     print
@@ -129,7 +129,7 @@ static void *__dlopen(const char *filename, int flag)
     if (!dlopen_ptr) {
         dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
         if (!dlopen_ptr) {
-            OS::DebugMessage("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
+            os::log("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
             return NULL;
         }
     }
@@ -155,7 +155,7 @@ void * dlopen(const char *filename, int flag)
 
     if (filename && handle && !libgl_filename) {
         if (0) {
-            OS::DebugMessage("apitrace: warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
+            os::log("apitrace: warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
         }
 
         // FIXME: handle absolute paths and other versions
@@ -169,10 +169,10 @@ void * dlopen(const char *filename, int flag)
             static int dummy = 0xdeedbeef;
             Dl_info info;
             if (dladdr(&dummy, &info)) {
-                OS::DebugMessage("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
+                os::log("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
                 handle = __dlopen(info.dli_fname, flag);
             } else {
-                OS::DebugMessage("apitrace: warning: dladdr() failed\n");
+                os::log("apitrace: warning: dladdr() failed\n");
             }
         }
     }
@@ -219,7 +219,7 @@ void * __libgl_sym(const char *symbol)
 
         libgl_handle = __dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
         if (!libgl_handle) {
-            OS::DebugMessage("apitrace: error: couldn't find libGL.so\n");
+            os::log("apitrace: error: couldn't find libGL.so\n");
             return NULL;
         }
     }