diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-16 17:55:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-16 17:55:05 -0700 |
| commit | 1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69 (patch) | |
| tree | e7255811abb746f8aab24c2048fa2134b5420c72 /opengl/include/GLES2/gl2ext.h | |
| parent | 08710dcd589432c5828cefce25e4b565b15de9a6 (diff) | |
| parent | e20a56d929fc8fedc2b468ea6d1900bd2aa6e81a (diff) | |
| download | frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.zip frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.tar.gz frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.tar.bz2 | |
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Diffstat (limited to 'opengl/include/GLES2/gl2ext.h')
| -rw-r--r-- | opengl/include/GLES2/gl2ext.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/opengl/include/GLES2/gl2ext.h b/opengl/include/GLES2/gl2ext.h index de5d65a..9db4e25 100644 --- a/opengl/include/GLES2/gl2ext.h +++ b/opengl/include/GLES2/gl2ext.h @@ -146,9 +146,12 @@ typedef void* GLeglImageOES; #define GL_INT_10_10_10_2_OES 0x8DF7 #endif -/* GL_OES_texture_external */ -#ifndef GL_TEXTURE_EXTERNAL_OES +/* GL_OES_EGL_image_external */ +#ifndef GL_OES_EGL_image_external #define GL_TEXTURE_EXTERNAL_OES 0x8D65 +#define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 +#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 #endif /*------------------------------------------------------------------------* @@ -546,9 +549,9 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); #define GL_OES_vertex_type_10_10_10_2 1 #endif -/* GL_OES_texture_external */ -#ifndef GL_OES_texture_external -#define GL_OES_texture_external 1 +/* GL_OES_EGL_image_external */ +#ifndef GL_OES_EGL_image_external +#define GL_OES_EGL_image_external 1 #endif /*------------------------------------------------------------------------* |