diff options
author | 2009-07-06 14:52:04 -0700 | |
---|---|---|
committer | 2009-07-06 14:52:04 -0700 | |
commit | d8b2a6412daef032d89c23e979758f6334b62093 (patch) | |
tree | dba55e2701d88e7bb380604520a230abb16b4b66 /opengl/libs/hooks.h | |
parent | d719890cab1eec09cbf556a3b86cc02b0f0ef8d7 (diff) | |
parent | 03a9a3449af3e0e79e9bbcd87f8057189ab9e151 (diff) |
Merge commit 'goog/master_gl' into merge_master_gl
Diffstat (limited to 'opengl/libs/hooks.h')
-rw-r--r-- | opengl/libs/hooks.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h index fd9725468a20..37292eef07ec 100644 --- a/opengl/libs/hooks.h +++ b/opengl/libs/hooks.h @@ -21,10 +21,14 @@ #include <string.h> #include <errno.h> +#include <pthread.h> + #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES/gl.h> #include <GLES/glext.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> #if !defined(__arm__) #define USE_SLOW_BINDING 1 @@ -76,11 +80,15 @@ enum { struct gl_hooks_t { struct gl_t { - #include "gl_entries.in" - #include "glext_entries.in" + #include "GLES_CM/gl_entries.in" + #include "GLES_CM/glext_entries.in" } gl; + struct gl2_t { + #include "GLES2/gl2_entries.in" + #include "GLES2/gl2ext_entries.in" + } gl2; struct egl_t { - #include "egl_entries.in" + #include "EGL/egl_entries.in" } egl; struct gl_ext_t { void (*extensions[MAX_NUMBER_OF_GL_EXTENSIONS])(void); @@ -94,6 +102,13 @@ struct gl_hooks_t { extern gl_hooks_t gHooks[IMPL_NUM_IMPLEMENTATIONS]; extern pthread_key_t gGLWrapperKey; +extern "C" void gl_unimplemented(); + +extern char const * const gl_names[]; +extern char const * const gl2_names[]; +extern char const * const egl_names[]; + +// ---------------------------------------------------------------------------- #if USE_FAST_TLS_KEY |