[Mesa-dev] Mesa (master): GLES2: upgrade gl2ext.h to version 16994.
Marek Olšák
maraeo at gmail.com
Tue Jul 3 16:48:18 PDT 2012
On Wed, Jul 4, 2012 at 12:40 AM, Brian Paul <brianp at vmware.com> wrote:
> On 07/03/2012 02:23 PM, Kristian Høgsberg wrote:
>>
>> Module: Mesa
>> Branch: master
>> Commit: 8818b88748bde6de5a4a98ad237c85151b44c774
>> URL:
>> http://cgit.freedesktop.org/mesa/mesa/commit/?id=8818b88748bde6de5a4a98ad237c85151b44c774
>>
>> Author: Gwenole Beauchesne<gwenole.beauchesne at intel.com>
>> Date: Mon Apr 23 10:55:28 2012 +0200
>>
>> GLES2: upgrade gl2ext.h to version 16994.
>>
>> ---
>>
>> include/GLES2/gl2ext.h | 384
>> ++++++++++++++++++++++++++++++++++++++++++++++--
>> 1 files changed, 372 insertions(+), 12 deletions(-)
>>
>> diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h
>> index 4eae246..e4016a5 100644
>> --- a/include/GLES2/gl2ext.h
>> +++ b/include/GLES2/gl2ext.h
>> @@ -1,7 +1,7 @@
>> #ifndef __gl2ext_h_
>> #define __gl2ext_h_
>>
>> -/* $Revision: 15049 $ on $Date:: 2011-07-06 17:28:16 -0700 #$ */
>> +/* $Revision: 16994 $ on $Date:: 2012-02-29 18:29:34 -0800 #$ */
>>
>> #ifdef __cplusplus
>> extern "C" {
>> @@ -207,6 +207,37 @@ typedef void* GLeglImageOES;
>> #define GL_MAX_SAMPLES_ANGLE 0x8D57
>> #endif
>>
>> +/* GL_ANGLE_instanced_arrays */
>> +#ifndef GL_ANGLE_instanced_arrays
>> +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE
>> +#endif
>> +
>> +/* GL_ANGLE_pack_reverse_row_order */
>> +#ifndef GL_ANGLE_pack_reverse_row_order
>> +#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4
>> +#endif
>> +
>> +/* GL_ANGLE_texture_compression_dxt3 */
>> +#ifndef GL_ANGLE_texture_compression_dxt3
>> +#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2
>> +#endif
>> +
>> +/* GL_ANGLE_texture_compression_dxt5 */
>> +#ifndef GL_ANGLE_texture_compression_dxt5
>> +#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3
>> +#endif
>> +
>> +/* GL_ANGLE_texture_usage */
>> +#ifndef GL_ANGLE_texture_usage
>> +#define GL_TEXTURE_USAGE_ANGLE 0x93A2
>> +#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3
>> +#endif
>> +
>> +/* GL_ANGLE_translated_shader_source */
>> +#ifndef GL_ANGLE_translated_shader_source
>> +#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0
>> +#endif
>> +
>>
>> /*------------------------------------------------------------------------*
>> * APPLE extension tokens
>>
>> *------------------------------------------------------------------------*/
>> @@ -261,6 +292,29 @@ typedef void* GLeglImageOES;
>> #define GL_MAX_EXT 0x8008
>> #endif
>>
>> +/* GL_EXT_color_buffer_half_float */
>> +#ifndef GL_EXT_color_buffer_half_float
>> +#define GL_RGBA16F_EXT 0x881A
>> +#define GL_RGB16F_EXT 0x881B
>> +#define GL_RG16F_EXT 0x822F
>> +#define GL_R16F_EXT 0x822D
>> +#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211
>> +#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17
>> +#endif
>> +
>> +/* GL_EXT_debug_label */
>> +#ifndef GL_EXT_debug_label
>> +#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F
>> +#define GL_PROGRAM_OBJECT_EXT 0x8B40
>> +#define GL_SHADER_OBJECT_EXT 0x8B48
>> +#define GL_BUFFER_OBJECT_EXT 0x9151
>> +#define GL_QUERY_OBJECT_EXT 0x9153
>> +#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154
>> +#endif
>> +
>> +/* GL_EXT_debug_marker */
>> +/* No new tokens introduced by this extension. */
>> +
>> /* GL_EXT_discard_framebuffer */
>> #ifndef GL_EXT_discard_framebuffer
>> #define GL_COLOR_EXT 0x1800
>> @@ -268,9 +322,26 @@ typedef void* GLeglImageOES;
>> #define GL_STENCIL_EXT 0x1802
>> #endif
>>
>> +/* GL_EXT_multisampled_render_to_texture */
>> +#ifndef GL_EXT_multisampled_render_to_texture
>> +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C
>> +#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 */
>> /* No new tokens introduced by this extension. */
>>
>> +/* GL_EXT_occlusion_query_boolean */
>> +#ifndef GL_EXT_occlusion_query_boolean
>> +#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F
>> +#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A
>> +#define GL_CURRENT_QUERY_EXT 0x8865
>> +#define GL_QUERY_RESULT_EXT 0x8866
>> +#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867
>> +#endif
>> +
>> /* GL_EXT_read_format_bgra */
>> #ifndef GL_EXT_read_format_bgra
>> #define GL_BGRA_EXT 0x80E1
>> @@ -278,9 +349,53 @@ typedef void* GLeglImageOES;
>> #define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366
>> #endif
>>
>> +/* GL_EXT_robustness */
>> +#ifndef GL_EXT_robustness
>> +/* reuse GL_NO_ERROR */
>> +#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253
>> +#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254
>> +#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255
>> +#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3
>> +#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256
>> +#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252
>> +#define GL_NO_RESET_NOTIFICATION_EXT 0x8261
>> +#endif
>> +
>> +/* GL_EXT_separate_shader_objects */
>> +#ifndef GL_EXT_separate_shader_objects
>> +#define GL_VERTEX_SHADER_BIT_EXT
>> 0x00000001
>> +#define GL_FRAGMENT_SHADER_BIT_EXT
>> 0x00000002
>> +#define GL_ALL_SHADER_BITS_EXT
>> 0xFFFFFFFF
>> +#define GL_PROGRAM_SEPARABLE_EXT 0x8258
>> +#define GL_ACTIVE_PROGRAM_EXT 0x8259
>> +#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A
>> +#endif
>> +
>> /* GL_EXT_shader_texture_lod */
>> /* No new tokens introduced by this extension. */
>>
>> +/* GL_EXT_shadow_samplers */
>> +#ifndef GL_EXT_shadow_samplers
>> +#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C
>> +#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D
>> +#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E
>> +#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62
>> +#endif
>> +
>> +/* GL_EXT_sRGB */
>> +#ifndef GL_EXT_sRGB
>> +#define GL_SRGB_EXT 0x8C40
>> +#define GL_SRGB_ALPHA_EXT 0x8C42
>> +#define GL_SRGB8_ALPHA8_EXT 0x8C43
>> +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210
>> +#endif
>> +
>> +/* GL_EXT_texture_compression_dxt1 */
>> +#ifndef GL_EXT_texture_compression_dxt1
>> +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
>> +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
>> +#endif
>> +
>> /* GL_EXT_texture_filter_anisotropic */
>> #ifndef GL_EXT_texture_filter_anisotropic
>> #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
>> @@ -292,17 +407,46 @@ typedef void* GLeglImageOES;
>> #define GL_BGRA_EXT 0x80E1
>> #endif
>>
>> +/* GL_EXT_texture_rg */
>> +#ifndef GL_EXT_texture_rg
>> +#define GL_RED_EXT 0x1903
>> +#define GL_RG_EXT 0x8227
>> +#define GL_R8_EXT 0x8229
>> +#define GL_RG8_EXT 0x822B
>> +#endif
>> +
>> +/* GL_EXT_texture_storage */
>> +#ifndef GL_EXT_texture_storage
>> +#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F
>> +#define GL_ALPHA8_EXT 0x803C
>> +#define GL_LUMINANCE8_EXT 0x8040
>> +#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
>> +#define GL_RGBA32F_EXT 0x8814
>> +#define GL_RGB32F_EXT 0x8815
>> +#define GL_ALPHA32F_EXT 0x8816
>> +#define GL_LUMINANCE32F_EXT 0x8818
>> +#define GL_LUMINANCE_ALPHA32F_EXT 0x8819
>> +/* reuse GL_RGBA16F_EXT */
>> +/* reuse GL_RGB16F_EXT */
>> +#define GL_ALPHA16F_EXT 0x881C
>> +#define GL_LUMINANCE16F_EXT 0x881E
>> +#define GL_LUMINANCE_ALPHA16F_EXT 0x881F
>> +#define GL_RGB10_A2_EXT 0x8059
>> +#define GL_RGB10_EXT 0x8052
>> +#define GL_BGRA8_EXT 0x93A1
>> +#define GL_R8_EXT 0x8229
>> +#define GL_RG8_EXT 0x822B
>> +#define GL_R32F_EXT 0x822E
>> +#define GL_RG32F_EXT 0x8230
>> +#define GL_R16F_EXT 0x822D
>> +#define GL_RG16F_EXT 0x822F
>> +#endif
>> +
>> /* GL_EXT_texture_type_2_10_10_10_REV */
>> #ifndef GL_EXT_texture_type_2_10_10_10_REV
>> #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368
>> #endif
>>
>> -/* GL_EXT_texture_compression_dxt1 */
>> -#ifndef GL_EXT_texture_compression_dxt1
>> -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
>> -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
>> -#endif
>> -
>> /* GL_EXT_unpack_subimage */
>> #ifndef GL_EXT_unpack_subimage
>> #define GL_UNPACK_ROW_LENGTH 0x0CF2
>> @@ -790,6 +934,45 @@ GL_APICALL void GL_APIENTRY
>> glRenderbufferStorageMultisampleANGLE (GLenum target
>> typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC)
>> (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width,
>> GLsizei height);
>> #endif
>>
>> +#ifndef GL_ANGLE_instanced_arrays
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode,
>> GLint first, GLsizei count, GLsizei primcount);
>> +GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode,
>> GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>> +GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index,
>> GLuint divisor);
>> +#endif
>> +typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum
>> mode, GLint first, GLsizei count, GLsizei primcount);
>> +typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum
>> mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>> +typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint
>> index, GLuint divisor);
>> +#endif
>> +
>> +/* GL_ANGLE_pack_reverse_row_order */
>> +#ifndef GL_ANGLE_pack_reverse_row_order
>> +#define GL_ANGLE_pack_reverse_row_order 1
>> +#endif
>> +
>> +/* GL_ANGLE_texture_compression_dxt3 */
>> +#ifndef GL_ANGLE_texture_compression_dxt3
>> +#define GL_ANGLE_texture_compression_dxt3 1
>> +#endif
>> +
>> +/* GL_ANGLE_texture_compression_dxt5 */
>> +#ifndef GL_ANGLE_texture_compression_dxt5
>> +#define GL_ANGLE_texture_compression_dxt5 1
>> +#endif
>> +
>> +/* GL_ANGLE_texture_usage */
>> +#ifndef GL_ANGLE_texture_usage
>> +#define GL_ANGLE_texture_usage 1
>> +#endif
>> +
>> +#ifndef GL_ANGLE_translated_shader_source
>> +#define GL_ANGLE_translated_shader_source 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint
>> shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>> +#endif
>> +typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC)
>> (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>> +#endif
>> +
>>
>> /*------------------------------------------------------------------------*
>> * APPLE extension functions
>>
>> *------------------------------------------------------------------------*/
>> @@ -843,6 +1026,35 @@ typedef void (GL_APIENTRYP
>> PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
>> #define GL_EXT_blend_minmax 1
>> #endif
>>
>> +/* GL_EXT_color_buffer_half_float */
>> +#ifndef GL_EXT_color_buffer_half_float
>> +#define GL_EXT_color_buffer_half_float 1
>> +#endif
>> +
>> +/* GL_EXT_debug_label */
>> +#ifndef GL_EXT_debug_label
>> +#define GL_EXT_debug_label 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object,
>> GLsizei length, const GLchar *label);
>> +GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint
>> object, GLsizei bufSize, GLsizei *length, GLchar *label);
>> +#endif
>> +typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint
>> object, GLsizei length, const GLchar *label);
>> +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type,
>> GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
>> +#endif
>> +
>> +/* GL_EXT_debug_marker */
>> +#ifndef GL_EXT_debug_marker
>> +#define GL_EXT_debug_marker 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const
>> GLchar *marker);
>> +GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const
>> GLchar *marker);
>> +GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void);
>> +#endif
>> +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);
>> +#endif
>> +
>> /* GL_EXT_discard_framebuffer */
>> #ifndef GL_EXT_discard_framebuffer
>> #define GL_EXT_discard_framebuffer 1
>> @@ -852,6 +1064,17 @@ GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT
>> (GLenum target, GLsizei numA
>> typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum
>> target, GLsizei numAttachments, const GLenum *attachments);
>> #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_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum,
>> GLsizei, GLenum, GLsizei, GLsizei);
>> +GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum,
>> GLenum, GLenum, GLuint, GLint, GLsizei);
>> +#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);
>> +#endif
>> +
>> #ifndef GL_EXT_multi_draw_arrays
>> #define GL_EXT_multi_draw_arrays 1
>> #ifdef GL_GLEXT_PROTOTYPES
>> @@ -862,16 +1085,134 @@ typedef void (GL_APIENTRYP
>> PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *fir
>> typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode,
>> const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei
>> primcount);
>> #endif
>>
>> +/* GL_EXT_occlusion_query_boolean */
>> +#ifndef GL_EXT_occlusion_query_boolean
>> +#define GL_EXT_occlusion_query_boolean 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
>> +GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint
>> *ids);
>> +GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
>> +GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
>> +GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
>> +GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname,
>> GLint *params);
>> +GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum
>> pname, GLuint *params);
>> +#endif
>> +typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint
>> *ids);
>> +typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const
>> GLuint *ids);
>> +typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
>> +typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint
>> id);
>> +typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
>> +typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum
>> pname, GLint *params);
>> +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id,
>> GLenum pname, GLuint *params);
>> +#endif
>> +
>> /* GL_EXT_read_format_bgra */
>> #ifndef GL_EXT_read_format_bgra
>> #define GL_EXT_read_format_bgra 1
>> #endif
>>
>> +/* GL_EXT_robustness */
>> +#ifndef GL_EXT_robustness
>> +#define GL_EXT_robustness 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
>> +GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei
>> width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void
>> *data);
>> +GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint
>> location, GLsizei bufSize, float *params);
>> +GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint
>> location, GLsizei bufSize, GLint *params);
>> +#endif
>> +typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
>> +typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y,
>> GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize,
>> void *data);
>> +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program,
>> GLint location, GLsizei bufSize, float *params);
>> +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program,
>> GLint location, GLsizei bufSize, GLint *params);
>> +#endif
>> +
>> +/* GL_EXT_separate_shader_objects */
>> +#ifndef GL_EXT_separate_shader_objects
>> +#define GL_EXT_separate_shader_objects 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline,
>> GLbitfield stages, GLuint program);
>> +GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline,
>> GLuint program);
>> +GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type,
>> GLsizei count, const GLchar **strings);
>> +GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline);
>> +GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const
>> GLuint *pipelines);
>> +GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint
>> *pipelines);
>> +GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint
>> pipeline);
>> +GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program,
>> GLenum pname, GLint value);
>> +GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline,
>> GLenum pname, GLint *params);
>> +GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint
>> location, GLint x);
>> +GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint
>> location, GLint x, GLint y);
>> +GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint
>> location, GLint x, GLint y, GLint z);
>> +GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint
>> location, GLint x, GLint y, GLint z, GLint w);
>> +GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint
>> location, GLfloat x);
>> +GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint
>> location, GLfloat x, GLfloat y);
>> +GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint
>> location, GLfloat x, GLfloat y, GLfloat z);
>> +GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint
>> location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
>> +GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint
>> location, GLsizei count, const GLint *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint
>> location, GLsizei count, const GLint *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint
>> location, GLsizei count, const GLint *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint
>> location, GLsizei count, const GLint *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint
>> location, GLsizei count, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint
>> location, GLsizei count, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint
>> location, GLsizei count, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint
>> location, GLsizei count, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program,
>> GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program,
>> GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program,
>> GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>> +GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint
>> pipeline);
>> +GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint
>> pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>> +#endif
>> +typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint
>> pipeline, GLbitfield stages, GLuint program);
>> +typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint
>> pipeline, GLuint program);
>> +typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum
>> type, GLsizei count, const GLchar **strings);
>> +typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint
>> pipeline);
>> +typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei
>> n, const GLuint *pipelines);
>> +typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n,
>> GLuint *pipelines);
>> +typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint
>> pipeline);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint
>> program, GLenum pname, GLint value);
>> +typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint
>> pipeline, GLenum pname, GLint *params);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program,
>> GLint location, GLint x);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program,
>> GLint location, GLint x, GLint y);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program,
>> GLint location, GLint x, GLint y, GLint z);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program,
>> GLint location, GLint x, GLint y, GLint z, GLint w);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program,
>> GLint location, GLfloat x);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program,
>> GLint location, GLfloat x, GLfloat y);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program,
>> GLint location, GLfloat x, GLfloat y, GLfloat z);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program,
>> GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLint *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLint *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLint *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLint *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLfloat *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLfloat *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLfloat *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, const GLfloat *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, GLboolean transpose, const GLfloat
>> *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, GLboolean transpose, const GLfloat
>> *value);
>> +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint
>> program, GLint location, GLsizei count, GLboolean transpose, const GLfloat
>> *value);
>> +typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint
>> pipeline);
>> +typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint
>> pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>> +#endif
>> +
>> /* GL_EXT_shader_texture_lod */
>> #ifndef GL_EXT_shader_texture_lod
>> #define GL_EXT_shader_texture_lod 1
>> #endif
>>
>> +/* GL_EXT_shadow_samplers */
>> +#ifndef GL_EXT_shadow_samplers
>> +#define GL_EXT_shadow_samplers 1
>> +#endif
>> +
>> +/* GL_EXT_sRGB */
>> +#ifndef GL_EXT_sRGB
>> +#define GL_EXT_sRGB 1
>> +#endif
>> +
>> +/* GL_EXT_texture_compression_dxt1 */
>> +#ifndef GL_EXT_texture_compression_dxt1
>> +#define GL_EXT_texture_compression_dxt1 1
>> +#endif
>> +
>> /* GL_EXT_texture_filter_anisotropic */
>> #ifndef GL_EXT_texture_filter_anisotropic
>> #define GL_EXT_texture_filter_anisotropic 1
>> @@ -882,16 +1223,35 @@ typedef void (GL_APIENTRYP
>> PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL
>> #define GL_EXT_texture_format_BGRA8888 1
>> #endif
>>
>> +/* GL_EXT_texture_rg */
>> +#ifndef GL_EXT_texture_rg
>> +#define GL_EXT_texture_rg 1
>> +#endif
>> +
>> +/* GL_EXT_texture_storage */
>> +#ifndef GL_EXT_texture_storage
>> +#define GL_EXT_texture_storage 1
>> +#ifdef GL_GLEXT_PROTOTYPES
>> +GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei
>> levels, GLenum internalformat, GLsizei width);
>> +GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei
>> levels, GLenum internalformat, GLsizei width, GLsizei height);
>> +GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei
>> levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei
>> depth);
>> +GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum
>> target, GLsizei levels, GLenum internalformat, GLsizei width);
>> +GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum
>> target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei
>> height);
>> +GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum
>> target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei
>> height, GLsizei depth);
>> +#endif
>> +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target,
>> GLsizei levels, GLenum internalformat, GLsizei width);
>> +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target,
>> GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>> +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target,
>> GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height,
>> GLsizei depth);
>> +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture,
>> GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>> +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture,
>> GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei
>> height);
>> +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture,
>> GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei
>> height, GLsizei depth);
>> +#endif
>> +
>> /* GL_EXT_texture_type_2_10_10_10_REV */
>> #ifndef GL_EXT_texture_type_2_10_10_10_REV
>> #define GL_EXT_texture_type_2_10_10_10_REV 1
>> #endif
>>
>> -/* GL_EXT_texture_compression_dxt1 */
>> -#ifndef GL_EXT_texture_compression_dxt1
>> -#define GL_EXT_texture_compression_dxt1 1
>> -#endif
>> -
>> /* GL_EXT_unpack_subimage */
>> #ifndef GL_EXT_unpack_subimage
>> #define GL_EXT_unpack_subimage 1
>>
>
> This is causing build failures for me:
>
> gcc -c -I../../../include -I../../../src/mapi -I../../../src/mesa
> -DMAPI_MODE_UTIL -g -Wall -std=c99 -Werror=implicit-function-declaration
> -Werror=missing-prototypes -fno-strict-aliasing -fno-builtin-memcmp -g -g
> -fPIC -D_GNU_SOURCE -DPTHREADS -DDEBUG -DUSE_X86_64_ASM
> -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_XSHM -DHAVE_MINCORE -DHAVE_LIBUDEV
> -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN -DHAVE_LLVM=0x0300 -fvisibility=hidden
> glapi_dispatch.c -o glapi_dispatch.o
> In file included from ../../../src/mapi/glapi/glapi_priv.h:49:0,
> from glapi_dispatch.c:40:
> ../../../include/GLES2/gl2ext.h:328:0: warning:
> "GL_RENDERBUFFER_SAMPLES_EXT" redefined
> ../../../include/GL/glext.h:4525:0: note: this is the location of the
> previous definition
> ../../../include/GLES2/gl2ext.h:329:0: warning:
> "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT" redefined
> ../../../include/GL/glext.h:4526:0: note: this is the location of the
> previous definition
> ../../../include/GLES2/gl2ext.h:330:0: warning: "GL_MAX_SAMPLES_EXT"
> redefined
> ../../../include/GL/glext.h:4527:0: note: this is the location of the
> previous definition
> In file included from ../../../src/mapi/glapi/glapi_priv.h:49:0,
> from glapi_dispatch.c:40:
> ../../../include/GLES2/gl2ext.h:1074:28: error: redefinition of typedef
> ‘PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC’
> ../../../include/GL/glext.h:10237:25: note: previous declaration of
> ‘PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC’ was here
> ../../../include/GLES2/gl2ext.h:1245:28: error: redefinition of typedef
> ‘PFNGLTEXTURESTORAGE1DEXTPROC’
> ../../../include/GL/glext.h:7881:25: note: previous declaration of
> ‘PFNGLTEXTURESTORAGE1DEXTPROC’ was here
> ../../../include/GLES2/gl2ext.h:1246:28: error: redefinition of typedef
> ‘PFNGLTEXTURESTORAGE2DEXTPROC’
> ../../../include/GL/glext.h:7882:25: note: previous declaration of
> ‘PFNGLTEXTURESTORAGE2DEXTPROC’ was here
> ../../../include/GLES2/gl2ext.h:1247:28: error: redefinition of typedef
> ‘PFNGLTEXTURESTORAGE3DEXTPROC’
> ../../../include/GL/glext.h:7883:25: note: previous declaration of
> ‘PFNGLTEXTURESTORAGE3DEXTPROC’ was here
>
>
> Anyone else? If so, let's revert it for now until it can be sorted out.
Okay, I reverted the commits, because I've got the same issue.
Marek
More information about the mesa-dev
mailing list