GlES2: Add NULL check

[android-x86/frameworks-native.git] / opengl / libs / GLES2 / gl2.cpp

diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp
index dd454bd..441d468 100644 (file)
--- a/opengl/libs/GLES2/gl2.cpp
+++ b/opengl/libs/GLES2/gl2.cpp
@@ -27,8 +27,8 @@
 #include <cutils/log.h>
 #include <cutils/properties.h>
 
-#include "hooks.h"
-#include "egl_impl.h"
+#include "../hooks.h"
+#include "../egl_impl.h"
 
 using namespace android;
 
@@ -40,13 +40,11 @@ using namespace android;
 #undef CALL_GL_API
 #undef CALL_GL_API_RETURN
 
-#if USE_FAST_TLS_KEY
-
-  #if defined(__arm__)
+#if defined(__arm__) && !USE_SLOW_BINDING
 
     #define GET_TLS(reg) "mrc p15, 0, " #reg ", c13, c0, 3 \n"
 
-    #define API_ENTRY(_api) __attribute__((naked)) _api
+    #define API_ENTRY(_api) __attribute__((noinline)) _api
 
     #define CALL_GL_API(_api, ...)                              \
          asm volatile(                                          \
@@ -54,15 +52,49 @@ using namespace android;
             "ldr   r12, [r12, %[tls]] \n"                       \
             "cmp   r12, #0            \n"                       \
             "ldrne pc,  [r12, %[api]] \n"                       \
-            "mov   r0, #0             \n"                       \
-            "bx    lr                 \n"                       \
             :                                                   \
             : [tls] "J"(TLS_SLOT_OPENGL_API*4),                 \
               [api] "J"(__builtin_offsetof(gl_hooks_t, gl._api))    \
             :                                                   \
             );
 
-  #elif defined(__mips__)
+#elif defined(__i386__) && !USE_SLOW_BINDING
+
+    /* Tell gcc 4.4+ to always omit the frame pointer to have working code
+     * independ of compiler flag
+     */
+    #define API_ENTRY(_api) __attribute__((noinline))            \
+            __attribute__((optimize("omit-frame-pointer")))      \
+            _api
+
+    /* pop %%ebp only because x86 doesn't support naked functions */
+    /* 4.4+ supports __attribute__((optimize)) that disable function
+     * prologues
+     */
+    #if __GNUC__ < 4 || \
+    (__GNUC__ == 4 && __GNUC_MINOR__ < 4 )
+         #define PROLOGUE  "pop %%ebp   \n"
+    #else
+         #define PROLOGUE  ""
+    #endif
+
+    #define CALL_GL_API(_api, ...)                              \
+        asm volatile(                                           \
+            PROLOGUE                                            \
+            "movl %%gs:0, %%ecx         \n"                     \
+            "movl %c[tls](%%ecx), %%eax \n"                     \
+            "test %%eax, %%eax          \n"                     \
+            "je out" #_api "            \n"                     \
+            "movl %c[api](%%eax), %%ecx \n"                     \
+            "jmp *%%ecx                 \n"                     \
+            "out" #_api ": ret          \n"                     \
+            :                                                   \
+            : [tls] "i"(TLS_SLOT_OPENGL_API*4),                 \
+              [api] "i"(__builtin_offsetof(gl_hooks_t, gl._api))    \
+            :                                                   \
+            );
+
+#elif defined(__mips__) && !USE_SLOW_BINDING
 
     #define API_ENTRY(_api) __attribute__((noinline)) _api
 
@@ -94,30 +126,21 @@ using namespace android;
             :                                                    \
             );
 
-  #else
-
-    #error Unsupported architecture
-
-  #endif
-
-    #define CALL_GL_API_RETURN(_api, ...) \
-        CALL_GL_API(_api, __VA_ARGS__) \
-        return 0; // placate gcc's warnings. never reached.
-
 #else
 
     #define API_ENTRY(_api) _api
 
     #define CALL_GL_API(_api, ...)                                       \
         gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl;  \
-        _c->_api(__VA_ARGS__);
-
-    #define CALL_GL_API_RETURN(_api, ...)                                \
-        gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl;  \
-        return _c->_api(__VA_ARGS__)
+        if (_c) return _c->_api(__VA_ARGS__);
 
 #endif
 
+#define CALL_GL_API_RETURN(_api, ...) \
+    CALL_GL_API(_api, __VA_ARGS__) \
+    return 0;
+
+
 
 extern "C" {
 #include "gl3_api.in"
@@ -139,7 +162,8 @@ const GLubyte * glGetString(GLenum name)
 {
     const GLubyte * ret = egl_get_string_for_current_context(name);
     if (ret == NULL) {
-        ret = __glGetString(name);
+        gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl;
+        if(_c) ret = _c->glGetString(name);
     }
     return ret;
 }