X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxtrace.py;h=b8dac38951b80006fa8a62d136a1d057409ad7b3;hb=4c5f6fa4d7474bc2a13a6c00bd3f4ac47ff56920;hp=a5317a4b74888f56c89142b29501a3c5832e3347;hpb=94215537cc85e6aecbbeea9bc5a08741b1618ac6;p=apitrace

diff --git a/glxtrace.py b/glxtrace.py
index a5317a4..b8dac38 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -1,5 +1,6 @@
 ##########################################################################
 #
+# Copyright 2011 Jose Fonseca
 # Copyright 2008-2010 VMware, Inc.
 # All Rights Reserved.
 #
@@ -27,19 +28,22 @@
 """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
 
 
 class GlxTracer(GlTracer):
 
-    def get_function_address(self, function):
-        return '__%s' % (function.name,)
+    def isFunctionPublic(self, function):
+        # The symbols visible in libGL.so can vary, so expose them all
+        return True
+
+    def wrapRet(self, function, instance):
+        GlTracer.wrapRet(self, function, instance)
 
-    def wrap_ret(self, function, instance):
         if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
             print '    %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
 
@@ -54,19 +58,21 @@ if __name__ == '__main__':
     print '#endif'
     print '#include <dlfcn.h>'
     print
-    print '#include "trace_write.hpp"'
+    print '#include "trace_writer_local.hpp"'
+    print
+    print '// To validate our prototypes'
+    print '#define GL_GLEXT_PROTOTYPES'
+    print '#define GLX_GLXEXT_PROTOTYPES'
     print
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print
-    print 'extern "C" {'
-    print
     print 'static __GLXextFuncPtr __unwrap_proc_addr(const GLubyte * procName, __GLXextFuncPtr procPtr);'
     print
 
     api = API()
-    api.add_api(glxapi)
-    api.add_api(glapi)
+    api.addApi(glxapi)
+    api.addApi(glapi)
     tracer = GlxTracer()
     tracer.trace_api(api)
 
@@ -77,56 +83,72 @@ 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::log("apitrace: warning: unknown function \\"%s\\"\\n", (const char *)procName);'
     print '    return procPtr;'
     print '}'
     print
     print r'''
 
+
 /*
- * Several applications, such as Quake3, use dlopen("libGL.so.1"), but
- * LD_PRELOAD does not intercept symbols obtained via dlopen/dlsym, therefore
- * we need to intercept the dlopen() call here, and redirect to our wrapper
- * shared object.
+ * Invoke the true dlopen() function.
  */
-void *dlopen(const char *filename, int flag)
+static void *__dlopen(const char *filename, int flag)
 {
     typedef void * (*PFNDLOPEN)(const char *, int);
     static PFNDLOPEN dlopen_ptr = NULL;
-    void *handle;
 
     if (!dlopen_ptr) {
         dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
         if (!dlopen_ptr) {
-            OS::DebugMessage("error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
+            os::log("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
             return NULL;
         }
     }
 
-    handle = dlopen_ptr(filename, flag);
+    return dlopen_ptr(filename, flag);
+}
+
 
-    if (filename && handle) {
+/*
+ * Several applications, such as Quake3, use dlopen("libGL.so.1"), but
+ * LD_PRELOAD does not intercept symbols obtained via dlopen/dlsym, therefore
+ * we need to intercept the dlopen() call here, and redirect to our wrapper
+ * shared object.
+ */
+extern "C" PUBLIC
+void * dlopen(const char *filename, int flag)
+{
+    void *handle;
+
+    handle = __dlopen(filename, flag);
+
+    const char * libgl_filename = getenv("TRACE_LIBGL");
+
+    if (filename && handle && !libgl_filename) {
         if (0) {
-            OS::DebugMessage("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
         if (strcmp(filename, "libGL.so") == 0 ||
             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;
             Dl_info info;
             if (dladdr(&dummy, &info)) {
-                OS::DebugMessage("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
-                handle = dlopen_ptr(info.dli_fname, flag);
+                os::log("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
+                handle = __dlopen(info.dli_fname, flag);
             } else {
-                OS::DebugMessage("warning: dladdr() failed\n");
+                os::log("apitrace: warning: dladdr() failed\n");
             }
         }
     }
@@ -134,5 +156,6 @@ void *dlopen(const char *filename, int flag)
     return handle;
 }
 
+
+
 '''
-    print '} /* extern "C" */'