diff options
| author | 2009-07-25 19:52:22 -0700 | |
|---|---|---|
| committer | 2009-07-25 21:15:25 -0700 | |
| commit | 2af1b3db3d4f687d008db74b150f149e956b4bc6 (patch) | |
| tree | 39d7d5bf15667c01f9b6dfe02bdd0e7fa36cd303 /opengl/libs/hooks.h | |
| parent | 8ecb36eec61f119f500a805b82438aadb3396a19 (diff) | |
| parent | cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f (diff) | |
Merge korg/donut into korg/master
Diffstat (limited to 'opengl/libs/hooks.h')
| -rw-r--r-- | opengl/libs/hooks.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h index 63fb017675bf..fd9725468a20 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 @@ -73,6 +77,7 @@ enum { struct gl_hooks_t { struct gl_t { #include "gl_entries.in" + #include "glext_entries.in" } gl; struct egl_t { #include "egl_entries.in" |