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/GLES_CM/gl.cpp | |
| 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/GLES_CM/gl.cpp')
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index 865cf44..12c3a07 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -29,6 +29,7 @@ #include <cutils/properties.h> #include "hooks.h" +#include "egl_impl.h" using namespace android; @@ -57,13 +58,6 @@ void glVertexPointerBounds(GLint size, GLenum type, // Actual GL entry-points // ---------------------------------------------------------------------------- -#if GL_LOGGER -# include "gl_logger.h" -# define GL_LOGGER_IMPL(_x) _x -#else -# define GL_LOGGER_IMPL(_x) -#endif - #undef API_ENTRY #undef CALL_GL_API #undef CALL_GL_API_RETURN @@ -96,16 +90,15 @@ void glVertexPointerBounds(GLint size, GLenum type, #define CALL_GL_API(_api, ...) \ gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \ - GL_LOGGER_IMPL( log_##_api(__VA_ARGS__); ) \ _c->_api(__VA_ARGS__) #define CALL_GL_API_RETURN(_api, ...) \ gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \ - GL_LOGGER_IMPL( log_##_api(__VA_ARGS__); ) \ return _c->_api(__VA_ARGS__) #endif + extern "C" { #include "gl_api.in" } @@ -114,3 +107,18 @@ extern "C" { #undef CALL_GL_API #undef CALL_GL_API_RETURN + +/* + * These GL calls are special because they need to EGL to retrieve some + * informations before they can execute. + */ + + +void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) +{ +} + +void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) +{ +} + |