Make windows build user friendlier.

[apitrace] / glxtrace.py

diff --git a/glxtrace.py b/glxtrace.py
index 7a3574b38c789239619a9c4c70ccba97573a6317..dfc24df0dcf57c30cc78e9ce603ce40c356f8b8f 100644 (file)
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -41,10 +41,9 @@ class GlxTracer(GlTracer):
         # The symbols visible in libGL.so can vary, so expose them all
         return True
 
-    def get_function_address(self, function):
-        return '__%s' % (function.name,)
-
     def wrap_ret(self, function, instance):
+        GlTracer.wrap_ret(self, function, instance)
+
         if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
             print '    %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
 
@@ -59,7 +58,11 @@ if __name__ == '__main__':
     print '#endif'
     print '#include <dlfcn.h>'
     print
-    print '#include "trace_write.hpp"'
+    print '#include "trace_writer.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"'
@@ -90,6 +93,9 @@ if __name__ == '__main__':
     print r'''
 
 
+/*
+ * Handle to the true libGL.so
+ */
 static void *libgl_handle = NULL;
 
 
@@ -126,7 +132,9 @@ void * dlopen(const char *filename, int flag)
 
     handle = __dlopen(filename, flag);
 
-    if (filename && handle) {
+    const char * libgl_filename = getenv("TRACE_LIBGL");
+
+    if (filename && handle && !libgl_filename) {
         if (0) {
             OS::DebugMessage("warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
         }
@@ -134,6 +142,7 @@ void * dlopen(const char *filename, int 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;
 
@@ -162,19 +171,34 @@ static void * __dlsym(const char *symbol)
 
     if (!libgl_handle) {
         /*
-         * Try to use whatever libGL.so the library is linked against.
+         * The app doesn't directly link against libGL.so, nor does it directly
+         * dlopen it.  So we have to load it ourselves.
          */
-        result = dlsym(RTLD_NEXT, symbol);
-        if (result) {
-            libgl_handle = RTLD_NEXT;
-            return result;
+
+        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";
         }
 
         /*
-         * The app doesn't directly link against libGL.so, nor does it directly
-         * dlopen it.  So we have to load it ourselves.
+         * 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.so", RTLD_LAZY | RTLD_LOCAL);
+
+        libgl_handle = __dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
         if (!libgl_handle) {
             OS::DebugMessage("error: couldn't find libGL.so\n");
             return NULL;