[Mesa-dev] [PATCH] include: update GL & GLES headers (v2)
Ian Romanick
idr at freedesktop.org
Sat Aug 4 00:47:31 UTC 2018
Acked-by: Ian Romanick <ian.d.romanick at intel.com>
On 08/03/2018 04:03 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> v2: use correct files
> ---
> include/GL/glcorearb.h | 76 ++++++++++++++++---
> include/GL/glext.h | 85 +++++++++++++++++++---
> include/GL/glxext.h | 22 +++++-
> include/GLES2/gl2.h | 8 +-
> include/GLES2/gl2ext.h | 161 +++++++++++++++++++++++++++++++++++++++--
> include/GLES3/gl3.h | 8 +-
> 6 files changed, 321 insertions(+), 39 deletions(-)
>
> diff --git a/include/GL/glcorearb.h b/include/GL/glcorearb.h
> index a78bbb6e182..3cf945c8b20 100644
> --- a/include/GL/glcorearb.h
> +++ b/include/GL/glcorearb.h
> @@ -1,12 +1,12 @@
> -#ifndef __glcorearb_h_
> -#define __glcorearb_h_ 1
> +#ifndef __gl_glcorearb_h_
> +#define __gl_glcorearb_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
> @@ -306,7 +306,7 @@ typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname
> typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
> typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
> typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
> -typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble near, GLdouble far);
> +typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble n, GLdouble f);
> typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
> #ifdef GL_GLEXT_PROTOTYPES
> GLAPI void APIENTRY glCullFace (GLenum mode);
> @@ -355,7 +355,7 @@ GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *par
> GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
> GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
> GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap);
> -GLAPI void APIENTRY glDepthRange (GLdouble near, GLdouble far);
> +GLAPI void APIENTRY glDepthRange (GLdouble n, GLdouble f);
> GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
> #endif
> #endif /* GL_VERSION_1_0 */
> @@ -613,9 +613,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);
>
> #ifndef GL_VERSION_1_5
> #define GL_VERSION_1_5 1
> -#include <stddef.h>
> -typedef ptrdiff_t GLsizeiptr;
> -typedef ptrdiff_t GLintptr;
> +#include <KHR/khrplatform.h>
> +typedef khronos_ssize_t GLsizeiptr;
> +typedef khronos_intptr_t GLintptr;
> #define GL_BUFFER_SIZE 0x8764
> #define GL_BUFFER_USAGE 0x8765
> #define GL_QUERY_COUNTER_BITS 0x8864
> @@ -3958,6 +3958,22 @@ GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
> #define GL_KHR_texture_compression_astc_sliced_3d 1
> #endif /* GL_KHR_texture_compression_astc_sliced_3d */
>
> +#ifndef GL_AMD_framebuffer_multisample_advanced
> +#define GL_AMD_framebuffer_multisample_advanced 1
> +#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
> +#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
> +#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
> +#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
> +#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
> +#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
> +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#endif
> +#endif /* GL_AMD_framebuffer_multisample_advanced */
> +
> #ifndef GL_AMD_performance_monitor
> #define GL_AMD_performance_monitor 1
> #define GL_COUNTER_TYPE_AMD 0x8BC0
> @@ -4001,6 +4017,17 @@ GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname
> #define GL_RGB_RAW_422_APPLE 0x8A51
> #endif /* GL_APPLE_rgb_422 */
>
> +#ifndef GL_EXT_EGL_image_storage
> +#define GL_EXT_EGL_image_storage 1
> +typedef void *GLeglImageOES;
> +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#endif
> +#endif /* GL_EXT_EGL_image_storage */
> +
> #ifndef GL_EXT_debug_label
> #define GL_EXT_debug_label 1
> #define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F
> @@ -4598,6 +4625,19 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
> #endif
> #endif /* GL_EXT_separate_shader_objects */
>
> +#ifndef GL_EXT_shader_framebuffer_fetch
> +#define GL_EXT_shader_framebuffer_fetch 1
> +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
> +#endif /* GL_EXT_shader_framebuffer_fetch */
> +
> +#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
> +#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
> +typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
> +#endif
> +#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
> +
> #ifndef GL_EXT_shader_integer_mix
> #define GL_EXT_shader_integer_mix 1
> #endif /* GL_EXT_shader_integer_mix */
> @@ -4612,6 +4652,8 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
>
> #ifndef GL_EXT_texture_filter_minmax
> #define GL_EXT_texture_filter_minmax 1
> +#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366
> +#define GL_WEIGHTED_AVERAGE_EXT 0x9367
> #endif /* GL_EXT_texture_filter_minmax */
>
> #ifndef GL_EXT_texture_sRGB_decode
> @@ -4635,6 +4677,11 @@ GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLi
> #endif
> #endif /* GL_EXT_window_rectangles */
>
> +#ifndef GL_INTEL_blackhole_render
> +#define GL_INTEL_blackhole_render 1
> +#define GL_BLACKHOLE_RENDER_INTEL 0x83FC
> +#endif /* GL_INTEL_blackhole_render */
> +
> #ifndef GL_INTEL_conservative_rasterization
> #define GL_INTEL_conservative_rasterization 1
> #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
> @@ -4677,7 +4724,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
> typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
> typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
> typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
> typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #ifdef GL_GLEXT_PROTOTYPES
> @@ -4688,7 +4735,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
> GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
> GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
> GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
> GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #endif
> @@ -4923,6 +4970,11 @@ GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat valu
> #endif
> #endif /* GL_NV_conservative_raster_dilate */
>
> +#ifndef GL_NV_conservative_raster_pre_snap
> +#define GL_NV_conservative_raster_pre_snap 1
> +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
> +#endif /* GL_NV_conservative_raster_pre_snap */
> +
> #ifndef GL_NV_conservative_raster_pre_snap_triangles
> #define GL_NV_conservative_raster_pre_snap_triangles 1
> #define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D
> @@ -4934,6 +4986,10 @@ GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param)
> #endif
> #endif /* GL_NV_conservative_raster_pre_snap_triangles */
>
> +#ifndef GL_NV_conservative_raster_underestimation
> +#define GL_NV_conservative_raster_underestimation 1
> +#endif /* GL_NV_conservative_raster_underestimation */
> +
> #ifndef GL_NV_draw_vulkan_image
> #define GL_NV_draw_vulkan_image 1
> typedef void (APIENTRY *GLVULKANPROCNV)(void);
> diff --git a/include/GL/glext.h b/include/GL/glext.h
> index 75fd1f61185..181df28d3bb 100644
> --- a/include/GL/glext.h
> +++ b/include/GL/glext.h
> @@ -1,12 +1,12 @@
> -#ifndef __glext_h_
> -#define __glext_h_ 1
> +#ifndef __gl_glext_h_
> +#define __gl_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
> @@ -51,7 +51,7 @@ extern "C" {
> #define GLAPI extern
> #endif
>
> -#define GL_GLEXT_VERSION 20171010
> +#define GL_GLEXT_VERSION 20180725
>
> /* Generated C header for:
> * API: gl
> @@ -464,9 +464,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);
>
> #ifndef GL_VERSION_1_5
> #define GL_VERSION_1_5 1
> -#include <stddef.h>
> -typedef ptrdiff_t GLsizeiptr;
> -typedef ptrdiff_t GLintptr;
> +#include <KHR/khrplatform.h>
> +typedef khronos_ssize_t GLsizeiptr;
> +typedef khronos_intptr_t GLintptr;
> #define GL_BUFFER_SIZE 0x8764
> #define GL_BUFFER_USAGE 0x8765
> #define GL_QUERY_COUNTER_BITS 0x8864
> @@ -4718,6 +4718,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
>
> #ifndef GL_ARB_vertex_buffer_object
> #define GL_ARB_vertex_buffer_object 1
> +#include <stddef.h>
> typedef ptrdiff_t GLsizeiptrARB;
> typedef ptrdiff_t GLintptrARB;
> #define GL_BUFFER_SIZE_ARB 0x8764
> @@ -5445,6 +5446,22 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG
> #endif
> #endif /* GL_AMD_draw_buffers_blend */
>
> +#ifndef GL_AMD_framebuffer_multisample_advanced
> +#define GL_AMD_framebuffer_multisample_advanced 1
> +#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
> +#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
> +#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
> +#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
> +#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
> +#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
> +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#endif
> +#endif /* GL_AMD_framebuffer_multisample_advanced */
> +
> #ifndef GL_AMD_framebuffer_sample_positions
> #define GL_AMD_framebuffer_sample_positions 1
> #define GL_SUBSAMPLE_DISTANCE_AMD 0x883F
> @@ -5709,6 +5726,10 @@ GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLf
> #define GL_AMD_shader_explicit_vertex_parameter 1
> #endif /* GL_AMD_shader_explicit_vertex_parameter */
>
> +#ifndef GL_AMD_shader_gpu_shader_half_float_fetch
> +#define GL_AMD_shader_gpu_shader_half_float_fetch 1
> +#endif /* GL_AMD_shader_gpu_shader_half_float_fetch */
> +
> #ifndef GL_AMD_shader_image_load_store_lod
> #define GL_AMD_shader_image_load_store_lod 1
> #endif /* GL_AMD_shader_image_load_store_lod */
> @@ -6456,6 +6477,17 @@ GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
> #define GL_422_REV_AVERAGE_EXT 0x80CF
> #endif /* GL_EXT_422_pixels */
>
> +#ifndef GL_EXT_EGL_image_storage
> +#define GL_EXT_EGL_image_storage 1
> +typedef void *GLeglImageOES;
> +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#endif
> +#endif /* GL_EXT_EGL_image_storage */
> +
> #ifndef GL_EXT_abgr
> #define GL_EXT_abgr 1
> #define GL_ABGR_EXT 0x8000
> @@ -7994,6 +8026,8 @@ GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei
> #define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591
> #define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592
> #define GL_LAYOUT_TRANSFER_DST_EXT 0x9593
> +#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
> +#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
> typedef void (APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
> typedef void (APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
> typedef GLboolean (APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
> @@ -8052,6 +8086,19 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
> #define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA
> #endif /* GL_EXT_separate_specular_color */
>
> +#ifndef GL_EXT_shader_framebuffer_fetch
> +#define GL_EXT_shader_framebuffer_fetch 1
> +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
> +#endif /* GL_EXT_shader_framebuffer_fetch */
> +
> +#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
> +#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
> +typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
> +#endif
> +#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
> +
> #ifndef GL_EXT_shader_image_load_formatted
> #define GL_EXT_shader_image_load_formatted 1
> #endif /* GL_EXT_shader_image_load_formatted */
> @@ -8352,6 +8399,8 @@ GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint
>
> #ifndef GL_EXT_texture_filter_minmax
> #define GL_EXT_texture_filter_minmax 1
> +#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366
> +#define GL_WEIGHTED_AVERAGE_EXT 0x9367
> #endif /* GL_EXT_texture_filter_minmax */
>
> #ifndef GL_EXT_texture_integer
> @@ -9099,6 +9148,11 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG
> #define GL_INTERLACE_READ_INGR 0x8568
> #endif /* GL_INGR_interlace_read */
>
> +#ifndef GL_INTEL_blackhole_render
> +#define GL_INTEL_blackhole_render 1
> +#define GL_BLACKHOLE_RENDER_INTEL 0x83FC
> +#endif /* GL_INTEL_blackhole_render */
> +
> #ifndef GL_INTEL_conservative_rasterization
> #define GL_INTEL_conservative_rasterization 1
> #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
> @@ -9180,7 +9234,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
> typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
> typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
> typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
> typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #ifdef GL_GLEXT_PROTOTYPES
> @@ -9191,7 +9245,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
> GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
> GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
> GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
> GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #endif
> @@ -9583,6 +9637,11 @@ GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat valu
> #endif
> #endif /* GL_NV_conservative_raster_dilate */
>
> +#ifndef GL_NV_conservative_raster_pre_snap
> +#define GL_NV_conservative_raster_pre_snap 1
> +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
> +#endif /* GL_NV_conservative_raster_pre_snap */
> +
> #ifndef GL_NV_conservative_raster_pre_snap_triangles
> #define GL_NV_conservative_raster_pre_snap_triangles 1
> #define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D
> @@ -9594,6 +9653,10 @@ GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param)
> #endif
> #endif /* GL_NV_conservative_raster_pre_snap_triangles */
>
> +#ifndef GL_NV_conservative_raster_underestimation
> +#define GL_NV_conservative_raster_underestimation 1
> +#endif /* GL_NV_conservative_raster_underestimation */
> +
> #ifndef GL_NV_copy_depth_to_color
> #define GL_NV_copy_depth_to_color 1
> #define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E
> @@ -9902,7 +9965,7 @@ GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachmen
> #define GL_PER_GPU_STORAGE_NV 0x9548
> #define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
> typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
> -typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
> +typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
> typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
> typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
> typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
> @@ -9915,7 +9978,7 @@ typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLu
> typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
> #ifdef GL_GLEXT_PROTOTYPES
> GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask);
> -GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
> +GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
> GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
> GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
> GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
> diff --git a/include/GL/glxext.h b/include/GL/glxext.h
> index 0f60a380c21..4c984ef4b89 100644
> --- a/include/GL/glxext.h
> +++ b/include/GL/glxext.h
> @@ -1,12 +1,12 @@
> -#ifndef __glxext_h_
> -#define __glxext_h_ 1
> +#ifndef __glx_glxext_h_
> +#define __glx_glxext_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
> @@ -34,7 +34,7 @@ extern "C" {
> ** https://github.com/KhronosGroup/OpenGL-Registry
> */
>
> -#define GLX_GLXEXT_VERSION 20170728
> +#define GLX_GLXEXT_VERSION 20180525
>
> /* Generated C header for:
> * API: glx
> @@ -325,6 +325,10 @@ void glXFreeContextEXT (Display *dpy, GLXContext context);
> #define GLX_VENDOR_NAMES_EXT 0x20F6
> #endif /* GLX_EXT_libglvnd */
>
> +#ifndef GLX_EXT_no_config_context
> +#define GLX_EXT_no_config_context 1
> +#endif /* GLX_EXT_no_config_context */
> +
> #ifndef GLX_EXT_stereo_tree
> #define GLX_EXT_stereo_tree 1
> typedef struct {
> @@ -503,6 +507,16 @@ Bool glXSet3DfxModeMESA (int mode);
> #endif
> #endif /* GLX_MESA_set_3dfx_mode */
>
> +#ifndef GLX_MESA_swap_control
> +#define GLX_MESA_swap_control 1
> +typedef int ( *PFNGLXGETSWAPINTERVALMESAPROC) (void);
> +typedef int ( *PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval);
> +#ifdef GLX_GLXEXT_PROTOTYPES
> +int glXGetSwapIntervalMESA (void);
> +int glXSwapIntervalMESA (unsigned int interval);
> +#endif
> +#endif /* GLX_MESA_swap_control */
> +
> #ifndef GLX_NV_copy_buffer
> #define GLX_NV_copy_buffer 1
> typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
> diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h
> index 8ba907c892c..b4051e5a7c5 100644
> --- a/include/GLES2/gl2.h
> +++ b/include/GLES2/gl2.h
> @@ -1,12 +1,12 @@
> -#ifndef __gl2_h_
> -#define __gl2_h_ 1
> +#ifndef __gles2_gl2_h_
> +#define __gles2_gl2_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
> @@ -44,7 +44,7 @@ extern "C" {
> #define GL_GLES_PROTOTYPES 1
> #endif
>
> -/* Generated on date 20170606 */
> +/* Generated on date 20180725 */
>
> /* Generated C header for:
> * API: gles2
> diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h
> index 0a93bfb8652..559173dee45 100644
> --- a/include/GLES2/gl2ext.h
> +++ b/include/GLES2/gl2ext.h
> @@ -1,12 +1,12 @@
> -#ifndef __gl2ext_h_
> -#define __gl2ext_h_ 1
> +#ifndef __gles2_gl2ext_h_
> +#define __gles2_gl2ext_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 20170804 */
> +/* Generated on date 20180725 */
>
> /* Generated C header for:
> * API: gles2
> @@ -159,6 +159,16 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params);
> #define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
> #endif /* GL_KHR_no_error */
>
> +#ifndef GL_KHR_parallel_shader_compile
> +#define GL_KHR_parallel_shader_compile 1
> +#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
> +#define GL_COMPLETION_STATUS_KHR 0x91B1
> +typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
> +#endif
> +#endif /* GL_KHR_parallel_shader_compile */
> +
> #ifndef GL_KHR_robust_buffer_access_behavior
> #define GL_KHR_robust_buffer_access_behavior 1
> #endif /* GL_KHR_robust_buffer_access_behavior */
> @@ -791,6 +801,22 @@ GL_APICALL void GL_APIENTRY glGetFloati_vOES (GLenum target, GLuint index, GLflo
> #define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
> #endif /* GL_AMD_compressed_ATC_texture */
>
> +#ifndef GL_AMD_framebuffer_multisample_advanced
> +#define GL_AMD_framebuffer_multisample_advanced 1
> +#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
> +#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
> +#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
> +#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
> +#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
> +#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
> +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +typedef void (GL_APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +GL_APICALL void GL_APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
> +#endif
> +#endif /* GL_AMD_framebuffer_multisample_advanced */
> +
> #ifndef GL_AMD_performance_monitor
> #define GL_AMD_performance_monitor 1
> #define GL_COUNTER_TYPE_AMD 0x8BC0
> @@ -1055,6 +1081,16 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei
> #define GL_EXT_EGL_image_array 1
> #endif /* GL_EXT_EGL_image_array */
>
> +#ifndef GL_EXT_EGL_image_storage
> +#define GL_EXT_EGL_image_storage 1
> +typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
> +GL_APICALL void GL_APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
> +#endif
> +#endif /* GL_EXT_EGL_image_storage */
> +
> #ifndef GL_EXT_YUV_target
> #define GL_EXT_YUV_target 1
> #define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT 0x8BE7
> @@ -1126,6 +1162,20 @@ GL_APICALL void GL_APIENTRY glClearTexSubImageEXT (GLuint texture, GLint level,
> #endif
> #endif /* GL_EXT_clear_texture */
>
> +#ifndef GL_EXT_clip_control
> +#define GL_EXT_clip_control 1
> +#define GL_LOWER_LEFT_EXT 0x8CA1
> +#define GL_UPPER_LEFT_EXT 0x8CA2
> +#define GL_NEGATIVE_ONE_TO_ONE_EXT 0x935E
> +#define GL_ZERO_TO_ONE_EXT 0x935F
> +#define GL_CLIP_ORIGIN_EXT 0x935C
> +#define GL_CLIP_DEPTH_MODE_EXT 0x935D
> +typedef void (GL_APIENTRYP PFNGLCLIPCONTROLEXTPROC) (GLenum origin, GLenum depth);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glClipControlEXT (GLenum origin, GLenum depth);
> +#endif
> +#endif /* GL_EXT_clip_control */
> +
> #ifndef GL_EXT_clip_cull_distance
> #define GL_EXT_clip_cull_distance 1
> #define GL_MAX_CLIP_DISTANCES_EXT 0x0D32
> @@ -1680,6 +1730,8 @@ GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location,
> #define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591
> #define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592
> #define GL_LAYOUT_TRANSFER_DST_EXT 0x9593
> +#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
> +#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
> typedef void (GL_APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
> typedef void (GL_APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
> typedef GLboolean (GL_APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
> @@ -1823,6 +1875,14 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin
> #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
> #endif /* GL_EXT_shader_framebuffer_fetch */
>
> +#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
> +#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
> +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierEXT (void);
> +#endif
> +#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
> +
> #ifndef GL_EXT_shader_group_vote
> #define GL_EXT_shader_group_vote 1
> #endif /* GL_EXT_shader_group_vote */
> @@ -2067,12 +2127,24 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
>
> #ifndef GL_EXT_texture_filter_minmax
> #define GL_EXT_texture_filter_minmax 1
> +#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366
> +#define GL_WEIGHTED_AVERAGE_EXT 0x9367
> #endif /* GL_EXT_texture_filter_minmax */
>
> #ifndef GL_EXT_texture_format_BGRA8888
> #define GL_EXT_texture_format_BGRA8888 1
> #endif /* GL_EXT_texture_format_BGRA8888 */
>
> +#ifndef GL_EXT_texture_format_sRGB_override
> +#define GL_EXT_texture_format_sRGB_override 1
> +#define GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT 0x8FBF
> +#endif /* GL_EXT_texture_format_sRGB_override */
> +
> +#ifndef GL_EXT_texture_mirror_clamp_to_edge
> +#define GL_EXT_texture_mirror_clamp_to_edge 1
> +#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743
> +#endif /* GL_EXT_texture_mirror_clamp_to_edge */
> +
> #ifndef GL_EXT_texture_norm16
> #define GL_EXT_texture_norm16 1
> #define GL_R16_EXT 0x822A
> @@ -2275,6 +2347,11 @@ GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target,
> #define GL_CUBIC_MIPMAP_LINEAR_IMG 0x913B
> #endif /* GL_IMG_texture_filter_cubic */
>
> +#ifndef GL_INTEL_blackhole_render
> +#define GL_INTEL_blackhole_render 1
> +#define GL_BLACKHOLE_RENDER_INTEL 0x83FC
> +#endif /* GL_INTEL_blackhole_render */
> +
> #ifndef GL_INTEL_conservative_rasterization
> #define GL_INTEL_conservative_rasterization 1
> #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
> @@ -2317,7 +2394,7 @@ typedef void (GL_APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
> typedef void (GL_APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
> typedef void (GL_APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
> typedef void (GL_APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> typedef void (GL_APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
> typedef void (GL_APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #ifdef GL_GLEXT_PROTOTYPES
> @@ -2328,7 +2405,7 @@ GL_APICALL void GL_APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
> GL_APICALL void GL_APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
> GL_APICALL void GL_APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
> GL_APICALL void GL_APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
> -GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
> +GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> GL_APICALL void GL_APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
> GL_APICALL void GL_APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #endif
> @@ -2454,6 +2531,17 @@ GL_APICALL void GL_APIENTRY glBlendBarrierNV (void);
> #define GL_FACTOR_MAX_AMD 0x901D
> #endif /* GL_NV_blend_minmax_factor */
>
> +#ifndef GL_NV_clip_space_w_scaling
> +#define GL_NV_clip_space_w_scaling 1
> +#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C
> +#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
> +#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
> +typedef void (GL_APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
> +#endif
> +#endif /* GL_NV_clip_space_w_scaling */
> +
> #ifndef GL_NV_conditional_render
> #define GL_NV_conditional_render 1
> #define GL_QUERY_WAIT_NV 0x8E13
> @@ -2480,6 +2568,11 @@ GL_APICALL void GL_APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybit
> #endif
> #endif /* GL_NV_conservative_raster */
>
> +#ifndef GL_NV_conservative_raster_pre_snap
> +#define GL_NV_conservative_raster_pre_snap 1
> +#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
> +#endif /* GL_NV_conservative_raster_pre_snap */
> +
> #ifndef GL_NV_conservative_raster_pre_snap_triangles
> #define GL_NV_conservative_raster_pre_snap_triangles 1
> #define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D
> @@ -2851,6 +2944,7 @@ GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvNV (GLint location, GLsizei coun
>
> #ifndef GL_NV_path_rendering
> #define GL_NV_path_rendering 1
> +typedef double GLdouble;
> #define GL_PATH_FORMAT_SVG_NV 0x9070
> #define GL_PATH_FORMAT_PS_NV 0x9071
> #define GL_STANDARD_FONT_NAME_NV 0x9072
> @@ -3061,6 +3155,25 @@ typedef GLenum (GL_APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathNa
> typedef GLenum (GL_APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
> typedef void (GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
> typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
> +typedef void (GL_APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
> +typedef void (GL_APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
> +typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
> +typedef void (GL_APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
> +typedef void (GL_APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
> +typedef void (GL_APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
> +typedef void (GL_APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
> +typedef void (GL_APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
> +typedef void (GL_APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
> +typedef void (GL_APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> +typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
> +typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL GLuint GL_APIENTRY glGenPathsNV (GLsizei range);
> GL_APICALL void GL_APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
> @@ -3119,6 +3232,25 @@ GL_APICALL GLenum GL_APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLe
> GL_APICALL GLenum GL_APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
> GL_APICALL void GL_APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
> GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
> +GL_APICALL void GL_APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
> +GL_APICALL void GL_APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
> +GL_APICALL void GL_APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
> +GL_APICALL void GL_APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
> +GL_APICALL void GL_APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
> +GL_APICALL void GL_APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
> +GL_APICALL void GL_APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
> +GL_APICALL void GL_APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
> +GL_APICALL void GL_APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
> +GL_APICALL void GL_APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
> +GL_APICALL void GL_APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
> +GL_APICALL void GL_APIENTRY glMatrixPopEXT (GLenum mode);
> +GL_APICALL void GL_APIENTRY glMatrixPushEXT (GLenum mode);
> +GL_APICALL void GL_APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
> +GL_APICALL void GL_APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
> +GL_APICALL void GL_APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
> +GL_APICALL void GL_APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> +GL_APICALL void GL_APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
> +GL_APICALL void GL_APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> #endif
> #endif /* GL_NV_path_rendering */
>
> @@ -3230,6 +3362,10 @@ GL_APICALL void GL_APIENTRY glResolveDepthValuesNV (void);
> #define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5
> #endif /* GL_NV_shadow_samplers_cube */
>
> +#ifndef GL_NV_stereo_view_rendering
> +#define GL_NV_stereo_view_rendering 1
> +#endif /* GL_NV_stereo_view_rendering */
> +
> #ifndef GL_NV_texture_border_clamp
> #define GL_NV_texture_border_clamp 1
> #define GL_TEXTURE_BORDER_COLOR_NV 0x1004
> @@ -3432,6 +3568,19 @@ GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierQCOM (void);
> #endif
> #endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
>
> +#ifndef GL_QCOM_texture_foveated
> +#define GL_QCOM_texture_foveated 1
> +#define GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM 0x8BFB
> +#define GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM 0x8BFC
> +#define GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM 0x8BFD
> +#define GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM 0x8BFE
> +#define GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM 0x8BFF
> +typedef void (GL_APIENTRYP PFNGLTEXTUREFOVEATIONPARAMETERSQCOMPROC) (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glTextureFoveationParametersQCOM (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
> +#endif
> +#endif /* GL_QCOM_texture_foveated */
> +
> #ifndef GL_QCOM_tiled_rendering
> #define GL_QCOM_tiled_rendering 1
> #define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001
> diff --git a/include/GLES3/gl3.h b/include/GLES3/gl3.h
> index 71e72b403ee..532bbbd3e2e 100644
> --- a/include/GLES3/gl3.h
> +++ b/include/GLES3/gl3.h
> @@ -1,12 +1,12 @@
> -#ifndef __gl3_h_
> -#define __gl3_h_ 1
> +#ifndef __gles2_gl3_h_
> +#define __gles2_gl3_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
> @@ -44,7 +44,7 @@ extern "C" {
> #define GL_GLES_PROTOTYPES 1
> #endif
>
> -/* Generated on date 20170606 */
> +/* Generated on date 20180725 */
>
> /* Generated C header for:
> * API: gles2
>
More information about the mesa-dev
mailing list