diff options
| author | Mathias Agopian <mathias@google.com> | 2010-06-23 10:17:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 10:17:56 -0700 |
| commit | 37d9a6b7c2e4c3ca50e08faefac64d849e0d74e3 (patch) | |
| tree | 6b101bce2dc1675ae30d80dae3d80490f15c40dd /opengl | |
| parent | dc79f0f2da32b8e84d37ae12d77c4138e72f7699 (diff) | |
| parent | cefb88587443323d147e687ff78eae9195eb584c (diff) | |
| download | frameworks_base-37d9a6b7c2e4c3ca50e08faefac64d849e0d74e3.zip frameworks_base-37d9a6b7c2e4c3ca50e08faefac64d849e0d74e3.tar.gz frameworks_base-37d9a6b7c2e4c3ca50e08faefac64d849e0d74e3.tar.bz2 | |
am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
Merge commit 'cefb88587443323d147e687ff78eae9195eb584c'
* commit 'cefb88587443323d147e687ff78eae9195eb584c':
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 *------------------------------------------------------------------------*/ |