[Mesa-dev] [PATCH 1/2] include: update GLES gl2ext header to no longer reference bad function
Samuel Pitoiset
samuel.pitoiset at gmail.com
Mon Aug 7 20:32:53 UTC 2017
For the series:
Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
On 08/06/2017 04:42 PM, Ilia Mirkin wrote:
> There was a previous error in the gl.xml and generated files that
> referenced glMultiDrawElementsBaseVertexOES. This function should not
> exist, only the EXT-suffixed version should.
>
> Leaving the other headers alone to avoid conflicts with GL 4.6 work.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
> include/GLES2/gl2ext.h | 57 +++++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 52 insertions(+), 5 deletions(-)
>
> diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h
> index e3068337748..cc90a6cf5d7 100644
> --- a/include/GLES2/gl2ext.h
> +++ b/include/GLES2/gl2ext.h
> @@ -38,7 +38,7 @@ extern "C" {
> #define GL_APIENTRYP GL_APIENTRY*
> #endif
>
> -/* Generated on date 20170606 */
> +/* Generated on date 20170804 */
>
> /* Generated C header for:
> * API: gles2
> @@ -324,12 +324,12 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediOES (GLenum target, GLuint index);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
> -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> +typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexOES (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
> -GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> +GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #endif
> #endif /* GL_OES_draw_elements_base_vertex */
>
> @@ -1311,12 +1311,10 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
> -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
> -GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #endif
> #endif /* GL_EXT_draw_elements_base_vertex */
>
> @@ -1340,6 +1338,17 @@ GL_APICALL void GL_APIENTRY glDrawTransformFeedbackInstancedEXT (GLenum mode, GL
> #endif
> #endif /* GL_EXT_draw_transform_feedback */
>
> +#ifndef GL_EXT_external_buffer
> +#define GL_EXT_external_buffer 1
> +typedef void *GLeglClientBufferEXT;
> +typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
> +typedef void (GL_APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
> +#ifdef GL_GLEXT_PROTOTYPES
> +GL_APICALL void GL_APIENTRY glBufferStorageExternalEXT (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
> +GL_APICALL void GL_APIENTRY glNamedBufferStorageExternalEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
> +#endif
> +#endif /* GL_EXT_external_buffer */
> +
> #ifndef GL_EXT_float_blend
> #define GL_EXT_float_blend 1
> #endif /* GL_EXT_float_blend */
> @@ -2001,18 +2010,42 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
> #define GL_TEXTURE_ASTC_DECODE_PRECISION_EXT 0x8F69
> #endif /* GL_EXT_texture_compression_astc_decode_mode */
>
> +#ifndef GL_EXT_texture_compression_bptc
> +#define GL_EXT_texture_compression_bptc 1
> +#define GL_COMPRESSED_RGBA_BPTC_UNORM_EXT 0x8E8C
> +#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT 0x8E8D
> +#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT 0x8E8E
> +#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT 0x8E8F
> +#endif /* GL_EXT_texture_compression_bptc */
> +
> #ifndef GL_EXT_texture_compression_dxt1
> #define GL_EXT_texture_compression_dxt1 1
> #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
> #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
> #endif /* GL_EXT_texture_compression_dxt1 */
>
> +#ifndef GL_EXT_texture_compression_rgtc
> +#define GL_EXT_texture_compression_rgtc 1
> +#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB
> +#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
> +#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
> +#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
> +#endif /* GL_EXT_texture_compression_rgtc */
> +
> #ifndef GL_EXT_texture_compression_s3tc
> #define GL_EXT_texture_compression_s3tc 1
> #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
> #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
> #endif /* GL_EXT_texture_compression_s3tc */
>
> +#ifndef GL_EXT_texture_compression_s3tc_srgb
> +#define GL_EXT_texture_compression_s3tc_srgb 1
> +#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
> +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
> +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
> +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
> +#endif /* GL_EXT_texture_compression_s3tc_srgb */
> +
> #ifndef GL_EXT_texture_cube_map_array
> #define GL_EXT_texture_cube_map_array 1
> #define GL_TEXTURE_CUBE_MAP_ARRAY_EXT 0x9009
> @@ -2405,6 +2438,12 @@ GL_APICALL void GL_APIENTRY glBlendBarrierNV (void);
> #define GL_BLEND_ADVANCED_COHERENT_NV 0x9285
> #endif /* GL_NV_blend_equation_advanced_coherent */
>
> +#ifndef GL_NV_blend_minmax_factor
> +#define GL_NV_blend_minmax_factor 1
> +#define GL_FACTOR_MIN_AMD 0x901C
> +#define GL_FACTOR_MAX_AMD 0x901D
> +#endif /* GL_NV_blend_minmax_factor */
> +
> #ifndef GL_NV_conditional_render
> #define GL_NV_conditional_render 1
> #define GL_QUERY_WAIT_NV 0x8E13
> @@ -3078,6 +3117,14 @@ GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum pro
> #define GL_SHARED_EDGE_NV 0xC0
> #endif /* GL_NV_path_rendering_shared_edge */
>
> +#ifndef GL_NV_pixel_buffer_object
> +#define GL_NV_pixel_buffer_object 1
> +#define GL_PIXEL_PACK_BUFFER_NV 0x88EB
> +#define GL_PIXEL_UNPACK_BUFFER_NV 0x88EC
> +#define GL_PIXEL_PACK_BUFFER_BINDING_NV 0x88ED
> +#define GL_PIXEL_UNPACK_BUFFER_BINDING_NV 0x88EF
> +#endif /* GL_NV_pixel_buffer_object */
> +
> #ifndef GL_NV_polygon_mode
> #define GL_NV_polygon_mode 1
> #define GL_POLYGON_MODE_NV 0x0B40
>
More information about the mesa-dev
mailing list