diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-16 17:57:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 17:57:34 -0700 |
| commit | c05246ae344f16f3892a1274ef75627772c7c9aa (patch) | |
| tree | 5e8f29e038ac9abe9b1e21490572ae81a4316169 /opengl | |
| parent | 11bed4a776856abca75e68f2327a3e277a064273 (diff) | |
| parent | 888db4d60bb19033f5d7a20cfd2ba5c318c7d74f (diff) | |
| download | frameworks_native-c05246ae344f16f3892a1274ef75627772c7c9aa.zip frameworks_native-c05246ae344f16f3892a1274ef75627772c7c9aa.tar.gz frameworks_native-c05246ae344f16f3892a1274ef75627772c7c9aa.tar.bz2 | |
am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp
* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
surfaceflinger / GL extensions cleanup
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/include/GLES/glext.h | 13 | ||||
| -rw-r--r-- | opengl/include/GLES2/gl2ext.h | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index a5b3ead..65ab5e4 100644 --- a/opengl/include/GLES/glext.h +++ b/opengl/include/GLES/glext.h @@ -211,9 +211,12 @@ typedef void* GLeglImageOES; #define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 #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 /*------------------------------------------------------------------------* @@ -782,9 +785,9 @@ typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arra typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); #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 /*------------------------------------------------------------------------* 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 /*------------------------------------------------------------------------* |