diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-14 17:14:36 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-02-14 17:14:36 -0800 |
| commit | 508c165b1956d19de40f5b792620f62a7b216e0f (patch) | |
| tree | 038ee1dd262ce922f25ce5bf05625b9f9a2a68e8 /opengl/libs/GLES_CM | |
| parent | 80fe2c4e5e8efdd4c24cb05345a8c31388ca5896 (diff) | |
| download | frameworks_base-508c165b1956d19de40f5b792620f62a7b216e0f.zip frameworks_base-508c165b1956d19de40f5b792620f62a7b216e0f.tar.gz frameworks_base-508c165b1956d19de40f5b792620f62a7b216e0f.tar.bz2 | |
Don't wrap EGLImageKHR and EGLSyncKHR anymore
this simplify our EGL wrapper implementation a lot.
This wrapping is no longer needed now that we can only
support a single underlaying EGL implementation.
Change-Id: I8213df7ac69daac447f1fe6e37044b78aac4e9a9
Diffstat (limited to 'opengl/libs/GLES_CM')
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 24 | ||||
| -rw-r--r-- | opengl/libs/GLES_CM/glext_api.in | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index adeaa5b..adcb60d 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -179,27 +179,3 @@ const GLubyte * glGetString(GLenum name) } return ret; } - -/* - * These GL calls are special because they need to EGL to retrieve some - * informations before they can execute. - */ - -extern "C" void __glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image); -extern "C" void __glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image); - - -void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) -{ - GLeglImageOES implImage = - (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image); - __glEGLImageTargetTexture2DOES(target, implImage); -} - -void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) -{ - GLeglImageOES implImage = - (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image); - __glEGLImageTargetRenderbufferStorageOES(target, implImage); -} - diff --git a/opengl/libs/GLES_CM/glext_api.in b/opengl/libs/GLES_CM/glext_api.in index 268a535..7cd6cb5 100644 --- a/opengl/libs/GLES_CM/glext_api.in +++ b/opengl/libs/GLES_CM/glext_api.in @@ -31,10 +31,10 @@ void API_ENTRY(glDrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GL void API_ENTRY(glDrawTexfvOES)(const GLfloat *coords) { CALL_GL_API(glDrawTexfvOES, coords); } -void API_ENTRY(__glEGLImageTargetTexture2DOES)(GLenum target, GLeglImageOES image) { +void API_ENTRY(glEGLImageTargetTexture2DOES)(GLenum target, GLeglImageOES image) { CALL_GL_API(glEGLImageTargetTexture2DOES, target, image); } -void API_ENTRY(__glEGLImageTargetRenderbufferStorageOES)(GLenum target, GLeglImageOES image) { +void API_ENTRY(glEGLImageTargetRenderbufferStorageOES)(GLenum target, GLeglImageOES image) { CALL_GL_API(glEGLImageTargetRenderbufferStorageOES, target, image); } void API_ENTRY(glAlphaFuncxOES)(GLenum func, GLclampx ref) { |