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 08556ec7052a41b170b8b1f8c4f3d3256f20c043..8a0fb347082182547bf01755cf0a0500845c60a4 100644 (file)
--- a/glproc_egl.cpp
+++ b/glproc_egl.cpp
@@ -37,11 +37,12 @@
 
 /*
  * Handle to the true OpenGL library.
+ * XXX: Not really used yet.
  */
 #if defined(_WIN32)
 HINSTANCE __libGlHandle = NULL;
 #else
-void *__libGlHandle = RTLD_NEXT;
+void *__libGlHandle = NULL;
 #endif
 
 
@@ -57,34 +58,94 @@ void *__libGlHandle = RTLD_NEXT;
 #else
 
 /*
- * Lookup a EGL or GLES symbol
+ * Lookup a public EGL/GL/GLES symbol
+ *
+ * The spec states that eglGetProcAddress should only be used for non-core
+ * (extensions) entry-points.  Core entry-points should be taken directly from
+ * the API specific libraries.
+ *
+ * We cannot tell here which API a symbol is meant for here (as some are
+ * exported by many).  So this code assumes that the appropriate shared
+ * libraries have been loaded previously (either dlopened with RTLD_GLOBAL, or
+ * as part of the executable dependencies), and that their symbols available
+ * for quering via dlsym(RTLD_NEXT, ...).
  */
-static inline void *
-__libegl_sym(const char *symbol)
-{
-    void *proc;
-
-    /* Always try dlsym before eglGetProcAddress as spec 3.10 says
-     * implementation may choose to also export extension functions
-     * publicly.
-     */
-    proc = dlsym(__libGlHandle, symbol);
-    if (!proc && symbol[0] == 'g' && symbol[1] == 'l')
-        proc = (void *) __eglGetProcAddress(symbol);
-
-    return proc;
-}
-
 void *
 __getPublicProcAddress(const char *procName)
 {
-    return __libegl_sym(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
 }
 
+/*
+ * Lookup a private EGL/GL/GLES symbol
+ *
+ * Private symbols should always be available through eglGetProcAddress, and
+ * they are guaranteed to work with any context bound (regardless of the API).
+ *
+ * However, per issue#57, eglGetProcAddress returns garbage on some
+ * implementations, and the spec states that implementations may choose to also
+ * export extension functions publicly, so we always attempt dlsym before
+ * eglGetProcAddress to mitigate that.
+ */
 void *
 __getPrivateProcAddress(const char *procName)
 {
-    return __libegl_sym(procName);
+    void *proc;
+    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;
 }
 
 #endif