commit e6288e2660e9c310986bff7148fcfb745c13af9a
author Pablo Ceballos <pceballos@google.com> Mon Oct 19 18:09:19 2015 +0000
committer Pablo Ceballos <pceballos@google.com> Mon Oct 19 18:09:19 2015 +0000
tree 47b4977c1bd7c5189b914b192180ccb9b5bfc138
parent 5bf6f3b5bf06e04a742bde8d40409d3c9e434c05

Revert "Remove GLTrace support"

This reverts commit 5bf6f3b5bf06e04a742bde8d40409d3c9e434c05.

Change-Id: I25a2d9b4a4b219cb76b405db1f68997519361cd6

opengl/libs/EGL/egl_display.cpp

diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 67edcf3..ec59235 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -38,6 +38,8 @@
 extern char const * const gBuiltinExtensionString;
 extern char const * const gExtensionString;
 
+extern void initEglTraceLevel();
+extern void initEglDebugLevel();
 extern void setGLHooksThreadSpecific(gl_hooks_t const *value);
 
 // ----------------------------------------------------------------------------
@@ -137,6 +139,15 @@
     {
         Mutex::Autolock _l(lock);
 
+#if EGL_TRACE
+
+        // Called both at early_init time and at this time. (Early_init is pre-zygote, so
+        // the information from that call may be stale.)
+        initEglTraceLevel();
+        initEglDebugLevel();
+
+#endif
+
         setGLHooksThreadSpecific(&gHooksNoContext);
 
         // initialize each EGL and