Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7d6615 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update GLES headers from Khronos SVN r26322""

parents f1186d58 2b2ac210

opengl/include/GLES/glext.h

+30 −125
Original line number Diff line number Diff line 
#ifndef __glext_h_

#define __glext_h_



/* $Revision: 20798 $ on $Date:: 2013-03-07 01:19:34 -0800 #$ */

/* $Revision: 16481 $ on $Date:: 2012-01-04 10:43:56 -0800 #$ */



#ifdef __cplusplus

extern "C" {
@@ -165,9 +165,6 @@ typedef void* GLeglImageOES; 
#define GL_DEPTH24_STENCIL8_OES                                 0x88F0

#endif



/* GL_OES_required_internalformat */

/* No new tokens introduced by this extension. */



/* GL_OES_rgb8_rgba8 */

#ifndef GL_OES_rgb8_rgba8

#define GL_RGB8_OES                                             0x8051
@@ -243,7 +240,7 @@ typedef void* GLeglImageOES; 
 * APPLE extension tokens

 *------------------------------------------------------------------------*/



/* GL_APPLE_copy_texture_levels */

/* GL_APPLE_texture_2D_limited_npot */

/* No new tokens introduced by this extension. */



/* GL_APPLE_framebuffer_multisample */
@@ -257,41 +254,6 @@ typedef void* GLeglImageOES; 
#define GL_READ_FRAMEBUFFER_BINDING_APPLE                       0x8CAA

#endif



/* GL_APPLE_sync */

#ifndef GL_APPLE_sync



/* These types are defined with reference to <inttypes.h>

 * in the Apple extension spec, but here we use the Khronos

 * portable types in khrplatform.h, and assume those types

 * are always defined.

 * If any other extensions using these types are defined,

 * the typedefs must move out of this block and be shared.

 */

typedef khronos_int64_t GLint64;

typedef khronos_uint64_t GLuint64;

typedef struct __GLsync *GLsync;



#define GL_SYNC_OBJECT_APPLE                                    0x8A53

#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE                        0x9111

#define GL_OBJECT_TYPE_APPLE                                    0x9112

#define GL_SYNC_CONDITION_APPLE                                 0x9113

#define GL_SYNC_STATUS_APPLE                                    0x9114

#define GL_SYNC_FLAGS_APPLE                                     0x9115

#define GL_SYNC_FENCE_APPLE                                     0x9116

#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE                     0x9117

#define GL_UNSIGNALED_APPLE                                     0x9118

#define GL_SIGNALED_APPLE                                       0x9119

#define GL_ALREADY_SIGNALED_APPLE                               0x911A

#define GL_TIMEOUT_EXPIRED_APPLE                                0x911B

#define GL_CONDITION_SATISFIED_APPLE                            0x911C

#define GL_WAIT_FAILED_APPLE                                    0x911D

#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE                        0x00000001

#define GL_TIMEOUT_IGNORED_APPLE                                0xFFFFFFFFFFFFFFFFull

#endif



/* GL_APPLE_texture_2D_limited_npot */

/* No new tokens introduced by this extension. */



/* GL_APPLE_texture_format_BGRA8888 */

#ifndef GL_APPLE_texture_format_BGRA8888

#define GL_BGRA_EXT                                             0x80E1
@@ -326,23 +288,12 @@ typedef struct __GLsync *GLsync; 
#define GL_STENCIL_EXT                                          0x1802

#endif



/* GL_EXT_map_buffer_range */

#ifndef GL_EXT_map_buffer_range

#define GL_MAP_READ_BIT_EXT                                     0x0001

#define GL_MAP_WRITE_BIT_EXT                                    0x0002

#define GL_MAP_INVALIDATE_RANGE_BIT_EXT                         0x0004

#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT                        0x0008

#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT                           0x0010

#define GL_MAP_UNSYNCHRONIZED_BIT_EXT                           0x0020

#endif



/* GL_EXT_multisampled_render_to_texture */

#ifndef GL_EXT_multisampled_render_to_texture

#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C

/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */

#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB

#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56

#define GL_MAX_SAMPLES_EXT                                      0x8D57

#define GL_RENDERBUFFER_SAMPLES_EXT                             0x9133

#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x9134

#define GL_MAX_SAMPLES_EXT                                      0x9135

#endif



/* GL_EXT_multi_draw_arrays */
@@ -820,11 +771,6 @@ typedef void (GL_APIENTRYP PFNGLWEIGHTPOINTEROESPROC) (GLint size, GLenum type, 
#define GL_OES_packed_depth_stencil 1

#endif



/* GL_OES_required_internalformat */

#ifndef GL_OES_required_internalformat

#define GL_OES_required_internalformat 1

#endif



/* GL_OES_query_matrix */

#ifndef GL_OES_query_matrix

#define GL_OES_query_matrix 1
@@ -946,52 +892,22 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); 
 * APPLE extension functions

 *------------------------------------------------------------------------*/



/* GL_APPLE_copy_texture_levels */

#ifndef GL_APPLE_copy_texture_levels

#define GL_APPLE_copy_texture_levels 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);

#endif

typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);

/* GL_APPLE_texture_2D_limited_npot */

#ifndef GL_APPLE_texture_2D_limited_npot

#define GL_APPLE_texture_2D_limited_npot 1

#endif



/* GL_APPLE_framebuffer_multisample */

#ifndef GL_APPLE_framebuffer_multisample

#define GL_APPLE_framebuffer_multisample 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei);

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

GL_API void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);

#endif /* GL_GLEXT_PROTOTYPES */

typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);

#endif



/* GL_APPLE_sync */

#ifndef GL_APPLE_sync

#define GL_APPLE_sync 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags);

GL_API GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync);

GL_API void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync);

GL_API GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);

GL_API void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);

GL_API void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params);

GL_API void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);

#endif

typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);

typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync);

typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync);

typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);

typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);

typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params);

typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);

#endif



/* GL_APPLE_texture_2D_limited_npot */

#ifndef GL_APPLE_texture_2D_limited_npot

#define GL_APPLE_texture_2D_limited_npot 1

#endif



/* GL_APPLE_texture_format_BGRA8888 */

#ifndef GL_APPLE_texture_format_BGRA8888

#define GL_APPLE_texture_format_BGRA8888 1
@@ -1029,23 +945,12 @@ GL_API void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttac 
typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);

#endif



/* GL_EXT_map_buffer_range */

#ifndef GL_EXT_map_buffer_range

#define GL_EXT_map_buffer_range 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY *glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);

GL_API void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length);

#endif

typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);

typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);

#endif



/* GL_EXT_multisampled_render_to_texture */

#ifndef GL_EXT_multisampled_render_to_texture

#define GL_EXT_multisampled_render_to_texture 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);

GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);

#endif

typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
@@ -1055,10 +960,10 @@ typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum 
#ifndef GL_EXT_multi_draw_arrays

#define GL_EXT_multi_draw_arrays 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei);

GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);

GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);

GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);

#endif /* GL_GLEXT_PROTOTYPES */

typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);

typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);

typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);

#endif
@@ -1149,8 +1054,8 @@ typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum 
#ifndef GL_IMG_user_clip_plane

#define GL_IMG_user_clip_plane 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glClipPlanefIMG (GLenum, const GLfloat *);

GL_API void GL_APIENTRY glClipPlanexIMG (GLenum, const GLfixed *);

GL_API void GL_APIENTRY glClipPlanefIMG (GLenum p, const GLfloat *eqn);

GL_API void GL_APIENTRY glClipPlanexIMG (GLenum p, const GLfixed *eqn);

#endif

typedef void (GL_APIENTRYP PFNGLCLIPPLANEFIMGPROC) (GLenum p, const GLfloat *eqn);

typedef void (GL_APIENTRYP PFNGLCLIPPLANEXIMGPROC) (GLenum p, const GLfixed *eqn);
@@ -1160,11 +1065,11 @@ typedef void (GL_APIENTRYP PFNGLCLIPPLANEXIMGPROC) (GLenum p, const GLfixed *eqn 
#ifndef GL_IMG_multisampled_render_to_texture

#define GL_IMG_multisampled_render_to_texture 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei);

GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);

GL_API void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);

#endif

typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);

typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);

typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);

#endif



/*------------------------------------------------------------------------*
@@ -1175,13 +1080,13 @@ typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum 
#ifndef GL_NV_fence

#define GL_NV_fence 1

#ifdef GL_GLEXT_PROTOTYPES

GL_API void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);

GL_API void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *);

GL_API GLboolean GL_APIENTRY glIsFenceNV (GLuint);

GL_API GLboolean GL_APIENTRY glTestFenceNV (GLuint);

GL_API void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);

GL_API void GL_APIENTRY glFinishFenceNV (GLuint);

GL_API void GL_APIENTRY glSetFenceNV (GLuint, GLenum);

GL_API void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);

GL_API void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);

GL_API GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);

GL_API GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);

GL_API void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);

GL_API void GL_APIENTRY glFinishFenceNV (GLuint fence);

GL_API void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);

#endif

typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);

typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);

opengl/include/GLES2/gl2.h

+338 −243

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/GLES2/gl2ext.h

+1027 −1316

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/GLES2/gl2platform.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __gl2platform_h_

#define __gl2platform_h_



/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */

/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */



/*

 * This document is licensed under the SGI Free Software B License Version

opengl/include/GLES3/gl3.h

+1022 −900

File changed.

Preview size limit exceeded, changes collapsed.