##########################################################################
#
+# Copyright 2011 Jose Fonseca
# Copyright 2008-2010 VMware, Inc.
# All Rights Reserved.
#
class GlxTracer(GlTracer):
- def get_function_address(self, function):
- return '__%s' % (function.name,)
+ def is_public_function(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)
+
if function.name in ("glXGetProcAddress", "glXGetProcAddressARB"):
print ' %s = __unwrap_proc_addr(procName, %s);' % (instance, instance)
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"'
print
- print 'extern "C" {'
- print
print 'static __GLXextFuncPtr __unwrap_proc_addr(const GLubyte * procName, __GLXextFuncPtr procPtr);'
print
print r'''
+/*
+ * Handle to the true libGL.so
+ */
static void *libgl_handle = NULL;
* we need to intercept the dlopen() call here, and redirect to our wrapper
* shared object.
*/
-void *dlopen(const char *filename, int flag)
+extern "C" PUBLIC
+void * dlopen(const char *filename, int flag)
{
void *handle;
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);
}
// 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;
return handle;
}
-} /* extern "C" */
-
/*
* Lookup a libGL 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;