os: Fix missing os::dump_backtrace symbol in Android builds.

[apitrace] / wrappers / glxtrace.py

diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
index d611d0b2588c197616adf4b2477a3279b2e5d65b..e9c43a9c65132e69ad0f34cb7697616b2a4f1a5e 100644 (file)
--- a/wrappers/glxtrace.py
+++ b/wrappers/glxtrace.py
@@ -110,6 +110,17 @@ class GlxTracer(GlTracer):
                 GLint level = 0;
                 GLint internalformat = GL_NONE;
                 _glGetTexLevelParameteriv(target, level, GL_TEXTURE_INTERNAL_FORMAT, &internalformat);
+                // XXX: GL_TEXTURE_INTERNAL_FORMAT cannot be trusted on NVIDIA
+                // -- it sometimes returns GL_BGRA, even though GL_BGR/BGRA is
+                // not a valid internal format.
+                switch (internalformat) {
+                case GL_BGR:
+                    internalformat = GL_RGB;
+                    break;
+                case GL_BGRA:
+                    internalformat = GL_RGBA;
+                    break;
+                }
                 GLint width = 0;
                 _glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
                 GLint height = 0;
@@ -149,14 +160,13 @@ if __name__ == '__main__':
     print '#include <stdlib.h>'
     print '#include <string.h>'
     print
-    print '#include <dlfcn.h>'
-    print
     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 "dlopen.hpp"'
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print
@@ -172,26 +182,6 @@ if __name__ == '__main__':
     print r'''
 
 
-/*
- * Invoke the true dlopen() function.
- */
-static void *_dlopen(const char *filename, int flag)
-{
-    typedef void * (*PFN_DLOPEN)(const char *, int);
-    static PFN_DLOPEN dlopen_ptr = NULL;
-
-    if (!dlopen_ptr) {
-        dlopen_ptr = (PFN_DLOPEN)dlsym(RTLD_NEXT, "dlopen");
-        if (!dlopen_ptr) {
-            os::log("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
-            return NULL;
-        }
-    }
-
-    return dlopen_ptr(filename, flag);
-}
-
-
 /*
  * Several applications, such as Quake3, use dlopen("libGL.so.1"), but
  * LD_PRELOAD does not intercept symbols obtained via dlopen/dlsym, therefore