X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=glxtrace.py;h=b8dac38951b80006fa8a62d136a1d057409ad7b3;hb=ae3981a47606435ed5d3567384d96c07f8d01131;hp=be577cb0d67f8bbf6585787cc0b9b4376584490b;hpb=6b490424d2b1a6036a6804dcea2cb0fe7845b9e5;p=apitrace

diff --git a/glxtrace.py b/glxtrace.py
index be577cb..b8dac38 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -37,12 +37,12 @@ from dispatch import function_pointer_type, function_pointer_value
 
 class GlxTracer(GlTracer):
 
-    def is_public_function(self, function):
+    def isFunctionPublic(self, function):
         # The symbols visible in libGL.so can vary, so expose them all
         return True
 
-    def wrap_ret(self, function, instance):
-        GlTracer.wrap_ret(self, function, instance)
+    def wrapRet(self, function, instance):
+        GlTracer.wrapRet(self, function, instance)
 
         if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
             print '    %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
@@ -58,7 +58,7 @@ if __name__ == '__main__':
     print '#endif'
     print '#include <dlfcn.h>'
     print
-    print '#include "trace_writer.hpp"'
+    print '#include "trace_writer_local.hpp"'
     print
     print '// To validate our prototypes'
     print '#define GL_GLEXT_PROTOTYPES'
@@ -71,8 +71,8 @@ if __name__ == '__main__':
     print
 
     api = API()
-    api.add_api(glxapi)
-    api.add_api(glapi)
+    api.addApi(glxapi)
+    api.addApi(glapi)
     tracer = GlxTracer()
     tracer.trace_api(api)
 
@@ -94,12 +94,6 @@ if __name__ == '__main__':
     print r'''
 
 
-/*
- * Handle to the true libGL.so
- */
-static void *libgl_handle = NULL;
-
-
 /*
  * Invoke the true dlopen() function.
  */
@@ -145,7 +139,7 @@ void * dlopen(const char *filename, int flag)
             strcmp(filename, "libGL.so.1") == 0) {
 
             // Use the true libGL.so handle instead of RTLD_NEXT from now on
-            libgl_handle = handle;
+            __libGlHandle = handle;
 
             // Get the file path for our shared object, and use it instead
             static int dummy = 0xdeedbeef;
@@ -163,51 +157,5 @@ void * dlopen(const char *filename, int flag)
 }
 
 
-/*
- * Lookup a libGL symbol
- */
-void * __libgl_sym(const char *symbol)
-{
-    void *result;
-
-    if (!libgl_handle) {
-        /*
-         * The app doesn't directly link against libGL.so, nor does it directly
-         * dlopen it.  So we have to load it ourselves.
-         */
-
-        const char * libgl_filename = getenv("TRACE_LIBGL");
-
-        if (!libgl_filename) {
-            /*
-             * Try to use whatever libGL.so the library is linked against.
-             */
-
-            result = dlsym(RTLD_NEXT, symbol);
-            if (result) {
-                libgl_handle = RTLD_NEXT;
-                return result;
-            }
-
-            libgl_filename = "libGL.so.1";
-        }
-
-        /*
-         * It would have been preferable to use RTLD_LOCAL to ensure that the
-         * application can never access libGL.so symbols directly, but this
-         * won't work, given libGL.so often loads a driver specific SO and
-         * exposes symbols to it.
-         */
-
-        libgl_handle = __dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
-        if (!libgl_handle) {
-            os::log("apitrace: error: couldn't find libGL.so\n");
-            return NULL;
-        }
-    }
-
-    return dlsym(libgl_handle, symbol);
-}
-
 
 '''