X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=cgltrace.py;h=b6a6fd0847215e9775f195b1a40c7cb2f740c774;hb=a0f95ec9c6acaf25291461ef7ddc124f281dbceb;hp=75da1b6016f90f759c8daf8309bef1f7a6f0473f;hpb=cbd225f575a0b92a293513223c4c9a74d2d4f8ab;p=apitrace

diff --git a/cgltrace.py b/cgltrace.py
index 75da1b6..b6a6fd0 100644
--- a/cgltrace.py
+++ b/cgltrace.py
@@ -27,9 +27,9 @@
 """Cgl tracing generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from cglapi import cglapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.cglapi import cglapi
 from gltrace import GlTracer
 
 
@@ -84,7 +84,7 @@ static void *libgl_handle = NULL;
 /*
  * Lookup a libGL symbol
  */
-static void * __dlsym(const char *symbol)
+void * __libgl_sym(const char *symbol)
 {
     void *result;
 
@@ -106,8 +106,8 @@ static void * __dlsym(const char *symbol)
         }
 
         if (!libgl_handle) {
-            OS::DebugMessage("apitrace: error: couldn't load %s\n", libgl_filename);
-            OS::Abort();
+            os::log("apitrace: error: couldn't load %s\n", libgl_filename);
+            os::abort();
             return NULL;
         }
     }
@@ -115,8 +115,8 @@ static void * __dlsym(const char *symbol)
     result = dlsym(libgl_handle, symbol);
 
     if (result == dlsym(RTLD_SELF, symbol)) {
-        OS::DebugMessage("apitrace: error: symbol lookup recursion\n");
-        OS::Abort();
+        os::log("apitrace: error: symbol lookup recursion\n");
+        os::abort();
         return NULL;
     }