diff options
Diffstat (limited to 'include/GLES')
| -rw-r--r-- | include/GLES/gl.h | 21 | ||||
| -rw-r--r-- | include/GLES/glext.h | 35 |
2 files changed, 36 insertions, 20 deletions
diff --git a/include/GLES/gl.h b/include/GLES/gl.h index 44dcddc7528..47ddc7eb2dd 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -1,12 +1,12 @@ -#ifndef __gl_h_ -#define __gl_h_ 1 +#ifndef __gles1_gl_h_ +#define __gles1_gl_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2017 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -36,7 +36,7 @@ extern "C" { #include <GLES/glplatform.h> -/* Generated on date 20170606 */ +/* Generated on date 20190611 */ /* Generated C header for: * API: gles1 @@ -50,20 +50,11 @@ extern "C" { #ifndef GL_VERSION_ES_CM_1_0 #define GL_VERSION_ES_CM_1_0 1 - -/* - * XXX: Temporary fix; needs to be reverted as part of the next - * header update. - * For more details: - * https://github.com/KhronosGroup/OpenGL-Registry/pull/76 - * https://lists.freedesktop.org/archives/mesa-dev/2017-June/161647.html - */ #include <KHR/khrplatform.h> typedef khronos_int8_t GLbyte; typedef khronos_float_t GLclampf; -typedef short GLshort; -typedef unsigned short GLushort; - +typedef khronos_int16_t GLshort; +typedef khronos_uint16_t GLushort; typedef void GLvoid; typedef unsigned int GLenum; typedef khronos_float_t GLfloat; diff --git a/include/GLES/glext.h b/include/GLES/glext.h index 6ea91a1e3ad..ee65666645d 100644 --- a/include/GLES/glext.h +++ b/include/GLES/glext.h @@ -1,12 +1,12 @@ -#ifndef __glext_h_ -#define __glext_h_ 1 +#ifndef __gles1_glext_h_ +#define __gles1_glext_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2017 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -38,7 +38,7 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20170606 */ +/* Generated on date 20190611 */ /* Generated C header for: * API: gles1 @@ -50,6 +50,10 @@ extern "C" { * Extensions removed: ^(GL_OES_read_format|GL_OES_compressed_paletted_texture|GL_OES_point_size_array|GL_OES_point_sprite)$ */ +#ifndef GL_KHR_debug +#define GL_KHR_debug 1 +#endif /* GL_KHR_debug */ + #ifndef GL_OES_EGL_image #define GL_OES_EGL_image 1 typedef void *GLeglImageOES; @@ -444,6 +448,11 @@ GL_API void GL_APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, #define GL_DECR_WRAP_OES 0x8508 #endif /* GL_OES_stencil_wrap */ +#ifndef GL_OES_surfaceless_context +#define GL_OES_surfaceless_context 1 +#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 +#endif /* GL_OES_surfaceless_context */ + #ifndef GL_OES_texture_cube_map #define GL_OES_texture_cube_map 1 #define GL_NORMAL_MAP_OES 0x8511 @@ -484,6 +493,10 @@ GL_API void GL_APIENTRY glGetTexGenivOES (GLenum coord, GLenum pname, GLint *par #define GL_MIRRORED_REPEAT_OES 0x8370 #endif /* GL_OES_texture_mirrored_repeat */ +#ifndef GL_OES_texture_npot +#define GL_OES_texture_npot 1 +#endif /* GL_OES_texture_npot */ + #ifndef GL_OES_vertex_array_object #define GL_OES_vertex_array_object 1 #define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 @@ -601,6 +614,19 @@ GL_API void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei buf #define GL_MAX_EXT 0x8008 #endif /* GL_EXT_blend_minmax */ +#ifndef GL_EXT_debug_marker +#define GL_EXT_debug_marker 1 +typedef char GLchar; +typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GL_API void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); +GL_API void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); +GL_API void GL_APIENTRY glPopGroupMarkerEXT (void); +#endif +#endif /* GL_EXT_debug_marker */ + #ifndef GL_EXT_discard_framebuffer #define GL_EXT_discard_framebuffer 1 #define GL_COLOR_EXT 0x1800 @@ -829,7 +855,6 @@ GL_API void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition); #ifndef GL_QCOM_driver_control #define GL_QCOM_driver_control 1 -typedef char GLchar; typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); |