Add the half float format.

[apitrace] / glxtrace.py

diff --git a/glxtrace.py b/glxtrace.py
index a7d07873d98506fa1a5cb1a07e6a75f0d51567c4..a5317a4b74888f56c89142b29501a3c5832e3347 100644 (file)
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -40,22 +40,18 @@ class GlxTracer(GlTracer):
         return '__%s' % (function.name,)
 
     def wrap_ret(self, function, instance):
-        if function.name.startswith("glXGetProcAddress"):
-            print '    if (%s) {' % instance
-            for f in glxapi.functions:
-                ptype = function_pointer_type(f)
-                pvalue = function_pointer_value(f)
-                print '        if(!strcmp("%s", (const char *)procName)) {' % f.name
-                print '            %s = (%s)%s;' % (pvalue, ptype, instance)
-                print '            %s = (%s)&%s;' % (instance, function.type, f.name);
-                print '        }'
-            print '    }'
+        if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
+            print '    %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
 
 
 if __name__ == '__main__':
     print
     print '#include <stdlib.h>'
     print '#include <string.h>'
+    print
+    print '#ifndef _GNU_SOURCE'
+    print '#define _GNU_SOURCE // for dladdr'
+    print '#endif'
     print '#include <dlfcn.h>'
     print
     print '#include "trace_write.hpp"'
@@ -65,10 +61,78 @@ if __name__ == '__main__':
     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)
     tracer = GlxTracer()
     tracer.trace_api(api)
+
+    print 'static __GLXextFuncPtr __unwrap_proc_addr(const GLubyte * procName, __GLXextFuncPtr procPtr) {'
+    print '    if (!procPtr) {'
+    print '        return procPtr;'
+    print '    }'
+    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 '        %s = (%s)procPtr;' % (pvalue, ptype)
+        print '        return (__GLXextFuncPtr)&%s;' % (f.name,)
+        print '    }'
+    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.
+ */
+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");
+            return NULL;
+        }
+    }
+
+    handle = dlopen_ptr(filename, flag);
+
+    if (filename && handle) {
+        if (0) {
+            OS::DebugMessage("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;
+
+            // 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);
+            } else {
+                OS::DebugMessage("warning: dladdr() failed\n");
+            }
+        }
+    }
+
+    return handle;
+}
+
+'''
     print '} /* extern "C" */'