Don't change behavior of glproc code via RETRACE define.

[apitrace] / glproc_egl.cpp

diff --git a/glproc_egl.cpp b/glproc_egl.cpp
index 4ceb2ff0b6b0a323e32c234aab19994cb7026c4c..8a0fb347082182547bf01755cf0a0500845c60a4 100644 (file)
--- a/glproc_egl.cpp
+++ b/glproc_egl.cpp
@@ -37,6 +37,7 @@
 
 /*
  * Handle to the true OpenGL library.
+ * XXX: Not really used yet.
  */
 #if defined(_WIN32)
 HINSTANCE __libGlHandle = NULL;
@@ -72,7 +73,54 @@ void *__libGlHandle = NULL;
 void *
 __getPublicProcAddress(const char *procName)
 {
+#if defined(ANDROID)
+    /*
+     * Android does not support LD_PRELOAD.  It is assumed that applications
+     * are explicitely loading egltrace.so.
+     */
+
+    if (procName[0] == 'e' && procName[1] == 'g' && procName[2] == 'l') {
+        static void *libEGL = NULL;
+        if (!libEGL) {
+            libEGL = dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY);
+            if (!libEGL) {
+                return NULL;
+            }
+        }
+        return dlsym(libEGL, procName);
+    }
+
+    if (procName[0] == 'g' && procName[1] == 'l') {
+        /* TODO: Use GLESv1/GLESv2 on a per-context basis. */
+        static void *sym = NULL;
+
+        static void *libGLESv2 = NULL;
+        if (!libGLESv2) {
+            libGLESv2 = dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY);
+        }
+        if (libGLESv2) {
+            sym = dlsym(libGLESv2, procName);
+        }
+        if (sym) {
+            return sym;
+        }
+
+        static void *libGLESv1 = NULL;
+        if (!libGLESv1) {
+            libGLESv1 = dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY);
+        }
+        if (libGLESv1) {
+            sym = dlsym(libGLESv1, procName);
+        }
+        if (sym) {
+            return sym;
+        }
+    }
+
+    return NULL;
+#else
     return dlsym(RTLD_NEXT, procName);
+#endif
 }
 
 /*
@@ -90,9 +138,12 @@ void *
 __getPrivateProcAddress(const char *procName)
 {
     void *proc;
-    proc = dlsym(RTLD_NEXT, procName);
-    if (!proc && procName[0] == 'g' && procName[1] == 'l')
+    proc = __getPublicProcAddress(procName);
+    if (!proc &&
+        ((procName[0] == 'e' && procName[1] == 'g' && procName[2] == 'l') ||
+         (procName[0] == 'g' && procName[1] == 'l'))) {
         proc = (void *) __eglGetProcAddress(procName);
+    }
 
     return proc;
 }