##########################################################################
#
+# 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 trace_function_impl_body(self, function):
+ GlTracer.trace_function_impl_body(self, function)
+
+ # Take snapshots
+ if function.name == 'glXSwapBuffers':
+ print ' glsnapshot::snapshot(__call);'
+ if function.name in ('glFinish', 'glFlush'):
+ print ' GLint __draw_framebuffer = 0;'
+ print ' __glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &__draw_framebuffer);'
+ print ' if (__draw_framebuffer == 0) {'
+ print ' GLint __draw_buffer = GL_NONE;'
+ print ' __glGetIntegerv(GL_DRAW_BUFFER, &__draw_buffer);'
+ print ' if (__draw_buffer == GL_FRONT) {'
+ print ' glsnapshot::snapshot(__call);'
+ print ' }'
+ print ' }'
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 '#include "glsnapshot.hpp"'
print
print 'static __GLXextFuncPtr __unwrap_proc_addr(const GLubyte * procName, __GLXextFuncPtr 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 ' if (strcmp("%s", (const char *)procName) == 0) {' % f.name
print ' %s = (%s)procPtr;' % (pvalue, ptype)
print ' return (__GLXextFuncPtr)&%s;' % (f.name,)
print ' }'
+ print ' OS::DebugMessage("apitrace: warning: unknown function \\"%s\\"\\n", (const char *)procName);'
print ' return procPtr;'
print '}'
print
print r'''
+/*
+ * Handle to the true libGL.so
+ */
static void *libgl_handle = NULL;
if (!dlopen_ptr) {
dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
if (!dlopen_ptr) {
- OS::DebugMessage("error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
+ OS::DebugMessage("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
return NULL;
}
}
* we need to intercept the dlopen() call here, and redirect to our wrapper
* shared object.
*/
-extern "C" 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);
+ OS::DebugMessage("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;
OS::DebugMessage("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
handle = __dlopen(info.dli_fname, flag);
} else {
- OS::DebugMessage("warning: dladdr() failed\n");
+ OS::DebugMessage("apitrace: warning: dladdr() failed\n");
}
}
}
/*
* Lookup a libGL symbol
*/
-static void * __dlsym(const char *symbol)
+void * __libgl_sym(const char *symbol)
{
void *result;
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");
+ OS::DebugMessage("apitrace: error: couldn't find libGL.so\n");
return NULL;
}
}