diff options
| author | Mathias Agopian <mathias@google.com> | 2009-04-22 18:24:18 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-04-23 13:45:48 -0700 |
| commit | e29254e708bb94d0f785a00926164a0dbb0dad93 (patch) | |
| tree | 65c92fe2698810d6d88877230d3c2e25f4f53e61 /opengl/libs/hooks.h | |
| parent | 644cf62660c87a9b8d5bcb22412cc2ad2aeea291 (diff) | |
| download | frameworks_base-e29254e708bb94d0f785a00926164a0dbb0dad93.zip frameworks_base-e29254e708bb94d0f785a00926164a0dbb0dad93.tar.gz frameworks_base-e29254e708bb94d0f785a00926164a0dbb0dad93.tar.bz2 | |
integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
Diffstat (limited to 'opengl/libs/hooks.h')
| -rw-r--r-- | opengl/libs/hooks.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h index 63fb017..392724f 100644 --- a/opengl/libs/hooks.h +++ b/opengl/libs/hooks.h @@ -22,9 +22,10 @@ #include <errno.h> #include <EGL/egl.h> +#include <EGL/eglext.h> #include <GLES/gl.h> +#include <GLES/glext.h> -#define GL_LOGGER 0 #if !defined(__arm__) #define USE_SLOW_BINDING 1 #else @@ -35,7 +36,7 @@ #define MAX_NUMBER_OF_GL_EXTENSIONS 32 -#if defined(HAVE_ANDROID_OS) && !USE_SLOW_BINDING && !GL_LOGGER && __OPTIMIZE__ +#if defined(HAVE_ANDROID_OS) && !USE_SLOW_BINDING && __OPTIMIZE__ #define USE_FAST_TLS_KEY 1 #else #define USE_FAST_TLS_KEY 0 @@ -55,7 +56,10 @@ const unsigned int NUM_DISPLAYS = 1; enum { IMPL_HARDWARE = 0, IMPL_SOFTWARE, - IMPL_CONTEXT_LOST, + + IMPL_NUM_DRIVERS_IMPLEMENTATIONS, + + IMPL_CONTEXT_LOST = IMPL_NUM_DRIVERS_IMPLEMENTATIONS, IMPL_NO_CONTEXT, IMPL_NUM_IMPLEMENTATIONS |