diff options
| author | Mathias Agopian <mathias@google.com> | 2010-06-21 15:14:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-21 15:14:29 -0700 |
| commit | cefb88587443323d147e687ff78eae9195eb584c (patch) | |
| tree | 74e88d82fa856b339afd87c86061b63873643361 /opengl | |
| parent | bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6 (diff) | |
| parent | 28333315c6f62b303de2ec0ac9e48158ed419f06 (diff) | |
| download | frameworks_base-cefb88587443323d147e687ff78eae9195eb584c.zip frameworks_base-cefb88587443323d147e687ff78eae9195eb584c.tar.gz frameworks_base-cefb88587443323d147e687ff78eae9195eb584c.tar.bz2 | |
am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp
* commit '28333315c6f62b303de2ec0ac9e48158ed419f06':
Added support for the GL_TEXTURE_EXTERNAL target
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/include/GLES/glext.h | 10 | ||||
| -rw-r--r-- | opengl/include/GLES2/gl2ext.h | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/opengl/include/GLES/glext.h b/opengl/include/GLES/glext.h index 9596148..a5b3ead 100644 --- a/opengl/include/GLES/glext.h +++ b/opengl/include/GLES/glext.h @@ -211,6 +211,11 @@ typedef void* GLeglImageOES; #define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 #endif +/* GL_OES_texture_external */ +#ifndef GL_TEXTURE_EXTERNAL_OES +#define GL_TEXTURE_EXTERNAL_OES 0x8D65 +#endif + /*------------------------------------------------------------------------* * AMD extension tokens *------------------------------------------------------------------------*/ @@ -777,6 +782,11 @@ 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 +#endif + /*------------------------------------------------------------------------* * AMD extension functions *------------------------------------------------------------------------*/ diff --git a/opengl/include/GLES2/gl2ext.h b/opengl/include/GLES2/gl2ext.h index d8c9f41..de5d65a 100644 --- a/opengl/include/GLES2/gl2ext.h +++ b/opengl/include/GLES2/gl2ext.h @@ -146,6 +146,11 @@ typedef void* GLeglImageOES; #define GL_INT_10_10_10_2_OES 0x8DF7 #endif +/* GL_OES_texture_external */ +#ifndef GL_TEXTURE_EXTERNAL_OES +#define GL_TEXTURE_EXTERNAL_OES 0x8D65 +#endif + /*------------------------------------------------------------------------* * AMD extension tokens *------------------------------------------------------------------------*/ @@ -541,6 +546,11 @@ 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 +#endif + /*------------------------------------------------------------------------* * AMD extension functions *------------------------------------------------------------------------*/ |