Skip to content

Commit 0589e58

Browse files
pixelflingerAndroid (Google) Code Review
pixelflinger
authored and
Android (Google) Code Review
committed
Merge "update GLES headers and add support for corresponding new extensions."
2 parents c0e32a4 + 780018d commit 0589e58

File tree

15 files changed

+4014
-146
lines changed

15 files changed

+4014
-146
lines changed

‎opengl/include/GLES/glext.h‎

Lines changed: 183 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __glext_h_
22
#define __glext_h_
33

4-
/* $Revision: 10965 $ on $Date:: 2010-04-09 02:11:29 -0700 #$ */
4+
/* $Revision: 16481 $ on $Date:: 2012-01-04 10:43:56 -0800 #$ */
55

66
#ifdef __cplusplus
77
extern "C" {
@@ -68,6 +68,14 @@ extern "C" {
6868
typedef void* GLeglImageOES;
6969
#endif
7070

71+
/* GL_OES_EGL_image_external */
72+
#ifndef GL_OES_EGL_image_external
73+
/* GLeglImageOES defined in GL_OES_EGL_image already. */
74+
#define GL_TEXTURE_EXTERNAL_OES 0x8D65
75+
#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67
76+
#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68
77+
#endif
78+
7179
/* GL_OES_element_index_uint */
7280
#ifndef GL_OES_element_index_uint
7381
#define GL_UNSIGNED_INT 0x1405
@@ -211,14 +219,6 @@ typedef void* GLeglImageOES;
211219
#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5
212220
#endif
213221

214-
/* GL_OES_EGL_image_external */
215-
#ifndef GL_OES_EGL_image_external
216-
#define GL_TEXTURE_EXTERNAL_OES 0x8D65
217-
#define GL_SAMPLER_EXTERNAL_OES 0x8D66
218-
#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67
219-
#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68
220-
#endif
221-
222222
/*------------------------------------------------------------------------*
223223
* AMD extension tokens
224224
*------------------------------------------------------------------------*/
@@ -243,6 +243,34 @@ typedef void* GLeglImageOES;
243243
/* GL_APPLE_texture_2D_limited_npot */
244244
/* No new tokens introduced by this extension. */
245245

246+
/* GL_APPLE_framebuffer_multisample */
247+
#ifndef GL_APPLE_framebuffer_multisample
248+
#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB
249+
#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56
250+
#define GL_MAX_SAMPLES_APPLE 0x8D57
251+
#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8
252+
#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9
253+
#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6
254+
#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA
255+
#endif
256+
257+
/* GL_APPLE_texture_format_BGRA8888 */
258+
#ifndef GL_APPLE_texture_format_BGRA8888
259+
#define GL_BGRA_EXT 0x80E1
260+
#endif
261+
262+
/* GL_APPLE_texture_max_level */
263+
#ifndef GL_APPLE_texture_max_level
264+
#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D
265+
#endif
266+
267+
/*------------------------------------------------------------------------*
268+
* ARM extension tokens
269+
*------------------------------------------------------------------------*/
270+
271+
/* GL_ARM_rgba8 */
272+
/* No new tokens introduced by this extension. */
273+
246274
/*------------------------------------------------------------------------*
247275
* EXT extension tokens
248276
*------------------------------------------------------------------------*/
@@ -260,6 +288,14 @@ typedef void* GLeglImageOES;
260288
#define GL_STENCIL_EXT 0x1802
261289
#endif
262290

291+
/* GL_EXT_multisampled_render_to_texture */
292+
#ifndef GL_EXT_multisampled_render_to_texture
293+
#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C
294+
#define GL_RENDERBUFFER_SAMPLES_EXT 0x9133
295+
#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x9134
296+
#define GL_MAX_SAMPLES_EXT 0x9135
297+
#endif
298+
263299
/* GL_EXT_multi_draw_arrays */
264300
/* No new tokens introduced by this extension. */
265301

@@ -270,6 +306,32 @@ typedef void* GLeglImageOES;
270306
#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366
271307
#endif
272308

309+
/* GL_EXT_robustness */
310+
#ifndef GL_EXT_robustness
311+
/* reuse GL_NO_ERROR */
312+
#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253
313+
#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254
314+
#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255
315+
#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3
316+
#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256
317+
#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252
318+
#define GL_NO_RESET_NOTIFICATION_EXT 0x8261
319+
#endif
320+
321+
/* GL_EXT_sRGB */
322+
#ifndef GL_EXT_sRGB
323+
#define GL_SRGB_EXT 0x8C40
324+
#define GL_SRGB_ALPHA_EXT 0x8C42
325+
#define GL_SRGB8_ALPHA8_EXT 0x8C43
326+
#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210
327+
#endif
328+
329+
/* GL_EXT_texture_compression_dxt1 */
330+
#ifndef GL_EXT_texture_compression_dxt1
331+
#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
332+
#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
333+
#endif
334+
273335
/* GL_EXT_texture_filter_anisotropic */
274336
#ifndef GL_EXT_texture_filter_anisotropic
275337
#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
@@ -288,6 +350,27 @@ typedef void* GLeglImageOES;
288350
#define GL_TEXTURE_LOD_BIAS_EXT 0x8501
289351
#endif
290352

353+
/* GL_EXT_texture_storage */
354+
#ifndef GL_EXT_texture_storage
355+
#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F
356+
#define GL_ALPHA8_EXT 0x803C
357+
#define GL_LUMINANCE8_EXT 0x8040
358+
#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
359+
#define GL_RGBA32F_EXT 0x8814
360+
#define GL_RGB32F_EXT 0x8815
361+
#define GL_ALPHA32F_EXT 0x8816
362+
#define GL_LUMINANCE32F_EXT 0x8818
363+
#define GL_LUMINANCE_ALPHA32F_EXT 0x8819
364+
/* reuse GL_RGBA16F_EXT */
365+
#define GL_RGB16F_EXT 0x881B
366+
#define GL_ALPHA16F_EXT 0x881C
367+
#define GL_LUMINANCE16F_EXT 0x881E
368+
#define GL_LUMINANCE_ALPHA16F_EXT 0x881F
369+
#define GL_RGB10_A2_EXT 0x8059
370+
#define GL_RGB10_EXT 0x8052
371+
#define GL_BGRA8_EXT 0x93A1
372+
#endif
373+
291374
/*------------------------------------------------------------------------*
292375
* IMG extension tokens
293376
*------------------------------------------------------------------------*/
@@ -507,6 +590,12 @@ typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target,
507590
typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
508591
#endif
509592

593+
/* GL_OES_EGL_image_external */
594+
#ifndef GL_OES_EGL_image_external
595+
#define GL_OES_EGL_image_external 1
596+
/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */
597+
#endif
598+
510599
/* GL_OES_element_index_uint */
511600
#ifndef GL_OES_element_index_uint
512601
#define GL_OES_element_index_uint 1
@@ -785,11 +874,6 @@ typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arra
785874
typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
786875
#endif
787876

788-
/* GL_OES_EGL_image_external */
789-
#ifndef GL_OES_EGL_image_external
790-
#define GL_OES_EGL_image_external 1
791-
#endif
792-
793877
/*------------------------------------------------------------------------*
794878
* AMD extension functions
795879
*------------------------------------------------------------------------*/
@@ -813,6 +897,36 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
813897
#define GL_APPLE_texture_2D_limited_npot 1
814898
#endif
815899

900+
/* GL_APPLE_framebuffer_multisample */
901+
#ifndef GL_APPLE_framebuffer_multisample
902+
#define GL_APPLE_framebuffer_multisample 1
903+
#ifdef GL_GLEXT_PROTOTYPES
904+
GL_API void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
905+
GL_API void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
906+
#endif /* GL_GLEXT_PROTOTYPES */
907+
typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
908+
typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
909+
#endif
910+
911+
/* GL_APPLE_texture_format_BGRA8888 */
912+
#ifndef GL_APPLE_texture_format_BGRA8888
913+
#define GL_APPLE_texture_format_BGRA8888 1
914+
#endif
915+
916+
/* GL_APPLE_texture_max_level */
917+
#ifndef GL_APPLE_texture_max_level
918+
#define GL_APPLE_texture_max_level 1
919+
#endif
920+
921+
/*------------------------------------------------------------------------*
922+
* ARM extension functions
923+
*------------------------------------------------------------------------*/
924+
925+
/* GL_ARM_rgba8 */
926+
#ifndef GL_ARM_rgba8
927+
#define GL_ARM_rgba8 1
928+
#endif
929+
816930
/*------------------------------------------------------------------------*
817931
* EXT extension functions
818932
*------------------------------------------------------------------------*/
@@ -831,6 +945,17 @@ GL_API void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttac
831945
typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
832946
#endif
833947

948+
/* GL_EXT_multisampled_render_to_texture */
949+
#ifndef GL_EXT_multisampled_render_to_texture
950+
#define GL_EXT_multisampled_render_to_texture 1
951+
#ifdef GL_GLEXT_PROTOTYPES
952+
GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
953+
GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
954+
#endif
955+
typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
956+
typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
957+
#endif
958+
834959
/* GL_EXT_multi_draw_arrays */
835960
#ifndef GL_EXT_multi_draw_arrays
836961
#define GL_EXT_multi_draw_arrays 1
@@ -847,6 +972,31 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL
847972
#define GL_EXT_read_format_bgra 1
848973
#endif
849974

975+
/* GL_EXT_robustness */
976+
#ifndef GL_EXT_robustness
977+
#define GL_EXT_robustness 1
978+
#ifdef GL_GLEXT_PROTOTYPES
979+
GL_API GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
980+
GL_API void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
981+
GL_API void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params);
982+
GL_API void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
983+
#endif
984+
typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
985+
typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
986+
typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params);
987+
typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
988+
#endif
989+
990+
/* GL_EXT_sRGB */
991+
#ifndef GL_EXT_sRGB
992+
#define GL_EXT_sRGB 1
993+
#endif
994+
995+
/* GL_EXT_texture_compression_dxt1 */
996+
#ifndef GL_EXT_texture_compression_dxt1
997+
#define GL_EXT_texture_compression_dxt1 1
998+
#endif
999+
8501000
/* GL_EXT_texture_filter_anisotropic */
8511001
#ifndef GL_EXT_texture_filter_anisotropic
8521002
#define GL_EXT_texture_filter_anisotropic 1
@@ -862,6 +1012,25 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL
8621012
#define GL_EXT_texture_lod_bias 1
8631013
#endif
8641014

1015+
/* GL_EXT_texture_storage */
1016+
#ifndef GL_EXT_texture_storage
1017+
#define GL_EXT_texture_storage 1
1018+
#ifdef GL_GLEXT_PROTOTYPES
1019+
GL_API void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
1020+
GL_API void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
1021+
GL_API void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
1022+
GL_API void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
1023+
GL_API void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
1024+
GL_API void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
1025+
#endif
1026+
typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
1027+
typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
1028+
typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
1029+
typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
1030+
typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
1031+
typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
1032+
#endif
1033+
8651034
/*------------------------------------------------------------------------*
8661035
* IMG extension functions
8671036
*------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)