From b60d816d6ee35cc1bfa2d2f6aed59104a09ec11d Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Mon, 3 Feb 2025 16:45:48 +0100 Subject: [PATCH] include: update GL headers from the registry Taken from OpenGL-Registry commit ca62982097eb ("Remove plural bindings in GL_ARB_shader_texture_image_samples (#637)") Signed-off-by: Lucas Stach Acked-by: Mike Blumenkrantz Part-of: --- include/GL/glcorearb.h | 6 + include/GL/glext.h | 18 ++- include/GL/glxext.h | 2 +- include/GL/wglext.h | 2 +- include/GLES/gl.h | 2 +- include/GLES/glext.h | 2 +- include/GLES2/gl2.h | 2 +- include/GLES2/gl2ext.h | 74 +++++++++++- include/GLES3/gl3.h | 2 +- src/mapi/glapi/registry/gl.xml | 201 ++++++++++++++++++++++++--------- 10 files changed, 242 insertions(+), 69 deletions(-) diff --git a/include/GL/glcorearb.h b/include/GL/glcorearb.h index 07517e7e5d9..2d95c385f6f 100644 --- a/include/GL/glcorearb.h +++ b/include/GL/glcorearb.h @@ -5838,6 +5838,10 @@ GLAPI void APIENTRY glTextureBarrierNV (void); #define GL_NV_texture_rectangle_compressed 1 #endif /* GL_NV_texture_rectangle_compressed */ +#ifndef GL_NV_uniform_buffer_std430_layout +#define GL_NV_uniform_buffer_std430_layout 1 +#endif /* GL_NV_uniform_buffer_std430_layout */ + #ifndef GL_NV_uniform_buffer_unified_memory #define GL_NV_uniform_buffer_unified_memory 1 #define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E @@ -5975,8 +5979,10 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s #define GL_MAX_VIEWS_OVR 0x9631 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #endif #endif /* GL_OVR_multiview */ diff --git a/include/GL/glext.h b/include/GL/glext.h index 8bacaf9906a..d00de04e628 100644 --- a/include/GL/glext.h +++ b/include/GL/glext.h @@ -32,7 +32,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20230309 +#define GL_GLEXT_VERSION 20250203 #include @@ -9409,6 +9409,11 @@ GLAPI void APIENTRY glResizeBuffersMESA (void); #define GL_MESA_shader_integer_functions 1 #endif /* GL_MESA_shader_integer_functions */ +#ifndef GL_MESA_texture_const_bandwidth +#define GL_MESA_texture_const_bandwidth 1 +#define GL_CONST_BW_TILING_MESA 0x8BBE +#endif /* GL_MESA_texture_const_bandwidth */ + #ifndef GL_MESA_tile_raster_order #define GL_MESA_tile_raster_order 1 #define GL_TILE_RASTER_ORDER_FIXED_MESA 0x8BB8 @@ -11464,6 +11469,10 @@ GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id); #endif #endif /* GL_NV_transform_feedback2 */ +#ifndef GL_NV_uniform_buffer_std430_layout +#define GL_NV_uniform_buffer_std430_layout 1 +#endif /* GL_NV_uniform_buffer_std430_layout */ + #ifndef GL_NV_uniform_buffer_unified_memory #define GL_NV_uniform_buffer_unified_memory 1 #define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E @@ -11979,8 +11988,10 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s #define GL_MAX_VIEWS_OVR 0x9631 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #endif #endif /* GL_OVR_multiview */ @@ -12906,11 +12917,6 @@ GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (co #define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC #endif /* GL_WIN_specular_fog */ -#ifndef GL_MESA_texture_const_bandwidth -#define GL_MESA_texture_const_bandwidth 1 -#define GL_CONST_BW_TILING_MESA 0x8BBE -#endif - #ifdef __cplusplus } #endif diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 62db44900f6..e36d5ed99ea 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -15,7 +15,7 @@ extern "C" { ** https://github.com/KhronosGroup/OpenGL-Registry */ -#define GLX_GLXEXT_VERSION 20220930 +#define GLX_GLXEXT_VERSION 20250203 /* Generated C header for: * API: glx diff --git a/include/GL/wglext.h b/include/GL/wglext.h index cbae0e12231..6ea6198a0a5 100644 --- a/include/GL/wglext.h +++ b/include/GL/wglext.h @@ -20,7 +20,7 @@ extern "C" { #include #endif -#define WGL_WGLEXT_VERSION 20230220 +#define WGL_WGLEXT_VERSION 20250203 /* Generated C header for: * API: wgl diff --git a/include/GLES/gl.h b/include/GLES/gl.h index df0372025ce..d6fccbadce7 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -17,7 +17,7 @@ extern "C" { #include -/* Generated on date 20230220 */ +/* Generated on date 20250203 */ /* Generated C header for: * API: gles1 diff --git a/include/GLES/glext.h b/include/GLES/glext.h index 9c829484cfd..9e79e77d2b7 100644 --- a/include/GLES/glext.h +++ b/include/GLES/glext.h @@ -19,7 +19,7 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20230220 */ +/* Generated on date 20250203 */ /* Generated C header for: * API: gles1 diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index bf399b00b44..ae33c1760a2 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -25,7 +25,7 @@ extern "C" { #define GL_GLES_PROTOTYPES 1 #endif -/* Generated on date 20230220 */ +/* Generated on date 20250203 */ /* Generated C header for: * API: gles2 diff --git a/include/GLES2/gl2ext.h b/include/GLES2/gl2ext.h index 2d0564ccc4e..eeaeaec1703 100644 --- a/include/GLES2/gl2ext.h +++ b/include/GLES2/gl2ext.h @@ -19,7 +19,7 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20230220 */ +#define GL_GLEXT_VERSION 20250203 /* Generated C header for: * API: gles2 @@ -1052,6 +1052,21 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei #define GL_ARM_rgba8 1 #endif /* GL_ARM_rgba8 */ +#ifndef GL_ARM_shader_core_properties +#define GL_ARM_shader_core_properties 1 +#define GL_SHADER_CORE_COUNT_ARM 0x96F0 +#define GL_SHADER_CORE_ACTIVE_COUNT_ARM 0x96F1 +#define GL_SHADER_CORE_PRESENT_MASK_ARM 0x96F2 +#define GL_SHADER_CORE_MAX_WARP_COUNT_ARM 0x96F3 +#define GL_SHADER_CORE_PIXEL_RATE_ARM 0x96F4 +#define GL_SHADER_CORE_TEXEL_RATE_ARM 0x96F5 +#define GL_SHADER_CORE_FMA_RATE_ARM 0x96F6 +typedef void (GL_APIENTRYP PFNGLMAXACTIVESHADERCORESARMPROC) (GLuint count); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glMaxActiveShaderCoresARM (GLuint count); +#endif +#endif /* GL_ARM_shader_core_properties */ + #ifndef GL_ARM_shader_framebuffer_fetch #define GL_ARM_shader_framebuffer_fetch 1 #define GL_FETCH_PER_SAMPLE_ARM 0x8F65 @@ -2563,10 +2578,42 @@ GL_APICALL void GL_APIENTRY glGetFramebufferParameterivMESA (GLenum target, GLen #define GL_PROGRAM_BINARY_FORMAT_MESA 0x875F #endif /* GL_MESA_program_binary_formats */ +#ifndef GL_MESA_sampler_objects +#define GL_MESA_sampler_objects 1 +#define GL_SAMPLER_BINDING 0x8919 +typedef void (GL_APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers); +typedef void (GL_APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers); +typedef GLboolean (GL_APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler); +typedef void (GL_APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param); +typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGenSamplers (GLsizei count, GLuint *samplers); +GL_APICALL void GL_APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers); +GL_APICALL GLboolean GL_APIENTRY glIsSampler (GLuint sampler); +GL_APICALL void GL_APIENTRY glBindSampler (GLuint unit, GLuint sampler); +GL_APICALL void GL_APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param); +GL_APICALL void GL_APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param); +GL_APICALL void GL_APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param); +GL_APICALL void GL_APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param); +GL_APICALL void GL_APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params); +#endif +#endif /* GL_MESA_sampler_objects */ + #ifndef GL_MESA_shader_integer_functions #define GL_MESA_shader_integer_functions 1 #endif /* GL_MESA_shader_integer_functions */ +#ifndef GL_MESA_texture_const_bandwidth +#define GL_MESA_texture_const_bandwidth 1 +#define GL_CONST_BW_TILING_MESA 0x8BBE +#endif /* GL_MESA_texture_const_bandwidth */ + #ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers #define GL_NVX_blend_equation_advanced_multi_draw_buffers 1 #endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */ @@ -3700,6 +3747,14 @@ GL_APICALL void GL_APIENTRY glShadingRateSampleOrderCustomNV (GLenum rate, GLuin #define GL_NV_stereo_view_rendering 1 #endif /* GL_NV_stereo_view_rendering */ +#ifndef GL_NV_texture_barrier +#define GL_NV_texture_barrier 1 +typedef void (GL_APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTextureBarrierNV (void); +#endif +#endif /* GL_NV_texture_barrier */ + #ifndef GL_NV_texture_border_clamp #define GL_NV_texture_border_clamp 1 #define GL_TEXTURE_BORDER_COLOR_NV 0x1004 @@ -3796,8 +3851,10 @@ GL_APICALL void GL_APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, #define GL_MAX_VIEWS_OVR 0x9631 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +typedef void (GL_APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +GL_APICALL void GL_APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #endif #endif /* GL_OVR_multiview */ @@ -3934,6 +3991,10 @@ GL_APICALL void GL_APIENTRY glTexEstimateMotionRegionsQCOM (GLuint ref, GLuint t #define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 #endif /* GL_QCOM_perfmon_global_mode */ +#ifndef GL_QCOM_render_sRGB_R8_RG8 +#define GL_QCOM_render_sRGB_R8_RG8 1 +#endif /* GL_QCOM_render_sRGB_R8_RG8 */ + #ifndef GL_QCOM_render_shared_exponent #define GL_QCOM_render_shared_exponent 1 #endif /* GL_QCOM_render_shared_exponent */ @@ -3991,6 +4052,11 @@ GL_APICALL void GL_APIENTRY glTextureFoveationParametersQCOM (GLuint texture, GL #define GL_MAX_SHADER_SUBSAMPLED_IMAGE_UNITS_QCOM 0x8FA1 #endif /* GL_QCOM_texture_foveated_subsampled_layout */ +#ifndef GL_QCOM_texture_lod_bias +#define GL_QCOM_texture_lod_bias 1 +#define GL_TEXTURE_LOD_BIAS_QCOM 0x8C96 +#endif /* GL_QCOM_texture_lod_bias */ + #ifndef GL_QCOM_tiled_rendering #define GL_QCOM_tiled_rendering 1 #define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 @@ -4038,6 +4104,12 @@ GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); #define GL_WRITEONLY_RENDERING_QCOM 0x8823 #endif /* GL_QCOM_writeonly_rendering */ +#ifndef GL_QCOM_ycbcr_degamma +#define GL_QCOM_ycbcr_degamma 1 +#define GL_TEXTURE_Y_DEGAMMA_QCOM 0x9710 +#define GL_TEXTURE_CBCR_DEGAMMA_QCOM 0x9711 +#endif /* GL_QCOM_ycbcr_degamma */ + #ifndef GL_VIV_shader_binary #define GL_VIV_shader_binary 1 #define GL_SHADER_BINARY_VIV 0x8FC4 diff --git a/include/GLES3/gl3.h b/include/GLES3/gl3.h index 4f8223f94f3..faea46d904b 100644 --- a/include/GLES3/gl3.h +++ b/include/GLES3/gl3.h @@ -25,7 +25,7 @@ extern "C" { #define GL_GLES_PROTOTYPES 1 #endif -/* Generated on date 20230220 */ +/* Generated on date 20250129 */ /* Generated C header for: * API: gles2 diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index 3683e0f5b3b..bf75349a9f1 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -79,7 +79,7 @@ typedef unsigned int GLhandleARB; - + @@ -96,7 +96,7 @@ typedef unsigned int GLhandleARB; - + @@ -315,9 +315,12 @@ typedef unsigned int GLhandleARB; - + + + + @@ -942,9 +945,9 @@ typedef unsigned int GLhandleARB; - - - + + + @@ -958,18 +961,18 @@ typedef unsigned int GLhandleARB; - + - + - + - + @@ -1094,7 +1097,7 @@ typedef unsigned int GLhandleARB; - + @@ -1698,10 +1701,10 @@ typedef unsigned int GLhandleARB; - + - + @@ -2448,9 +2451,9 @@ typedef unsigned int GLhandleARB; this range. Lesson: assigned ranges belong to vendors, not engineers! --> - - - + + + @@ -2511,9 +2514,9 @@ typedef unsigned int GLhandleARB; - - - + + + @@ -4572,6 +4575,7 @@ typedef unsigned int GLhandleARB; + @@ -4811,7 +4815,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -6923,9 +6929,9 @@ typedef unsigned int GLhandleARB; - + - + @@ -6948,10 +6954,10 @@ typedef unsigned int GLhandleARB; - + - + @@ -6993,12 +6999,37 @@ typedef unsigned int GLhandleARB; - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -7327,7 +7358,7 @@ typedef unsigned int GLhandleARB; void glBeginPerfQueryINTEL - GLuint queryHandle + GLuint queryHandle void glBeginQuery @@ -10318,8 +10349,8 @@ typedef unsigned int GLhandleARB; void glCreatePerfQueryINTEL - GLuint queryId - GLuint *queryHandle + GLuint queryId + GLuint *queryHandle GLuint glCreateProgram @@ -10668,7 +10699,7 @@ typedef unsigned int GLhandleARB; void glDeletePerfQueryINTEL - GLuint queryHandle + GLuint queryHandle void glDeleteProgram @@ -11739,7 +11770,7 @@ typedef unsigned int GLhandleARB; void glEndPerfQueryINTEL - GLuint queryHandle + GLuint queryHandle void glEndQuery @@ -13494,7 +13525,7 @@ typedef unsigned int GLhandleARB; void glGetFirstPerfQueryIdINTEL - GLuint *queryId + GLuint *queryId void glGetFixedv @@ -14340,8 +14371,8 @@ typedef unsigned int GLhandleARB; void glGetNextPerfQueryIdINTEL - GLuint queryId - GLuint *nextQueryId + GLuint queryId + GLuint *nextQueryId void glGetObjectBufferfvATI @@ -14376,7 +14407,7 @@ typedef unsigned int GLhandleARB; GLenum identifier GLuint name GLsizei bufSize - GLsizei *length + GLsizei *length GLchar *label @@ -14515,7 +14546,7 @@ typedef unsigned int GLhandleARB; void glGetPerfCounterInfoINTEL - GLuint queryId + GLuint queryId GLuint counterId GLuint counterNameLength GLchar *counterName @@ -14573,8 +14604,8 @@ typedef unsigned int GLhandleARB; void glGetPerfQueryDataINTEL - GLuint queryHandle - GLuint flags + GLuint queryHandle + GLuint flags GLsizei dataSize void *data GLuint *bytesWritten @@ -14582,11 +14613,11 @@ typedef unsigned int GLhandleARB; void glGetPerfQueryIdByNameINTEL GLchar *queryName - GLuint *queryId + GLuint *queryId void glGetPerfQueryInfoINTEL - GLuint queryId + GLuint queryId GLuint queryNameLength GLchar *queryName GLuint *dataSize @@ -17812,6 +17843,10 @@ typedef unsigned int GLhandleARB; GLfloat y GLfloat z + + void glMaxActiveShaderCoresARM + GLuint count + void glMaxShaderCompilerThreadsKHR GLuint count @@ -19351,6 +19386,15 @@ typedef unsigned int GLhandleARB; GLint level GLint layer + + void glNamedFramebufferTextureMultiviewOVR + GLuint framebuffer + GLenum attachment + GLuint texture + GLint level + GLint baseViewIndex + GLsizei numViews + void glNamedProgramLocalParameter4dEXT GLuint program @@ -28195,7 +28239,7 @@ typedef unsigned int GLhandleARB; GLint size GLenum type GLsizei stride - const void *pointer + const void *pointer void glVertexAttribIPointerEXT @@ -28203,7 +28247,7 @@ typedef unsigned int GLhandleARB; GLint size GLenum type GLsizei stride - const void *pointer + const void *pointer @@ -28428,7 +28472,7 @@ typedef unsigned int GLhandleARB; GLint size GLenum type GLsizei stride - const void *pointer + const void *pointer void glVertexAttribLPointerEXT @@ -28436,7 +28480,7 @@ typedef unsigned int GLhandleARB; GLint size GLenum type GLsizei stride - const void *pointer + const void *pointer @@ -28508,7 +28552,7 @@ typedef unsigned int GLhandleARB; GLenum type GLboolean normalized GLsizei stride - const void *pointer + const void *pointer void glVertexAttribPointerARB @@ -28517,7 +28561,7 @@ typedef unsigned int GLhandleARB; GLenum type GLboolean normalized GLsizei stride - const void *pointer + const void *pointer @@ -39620,6 +39664,18 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -42328,6 +42384,7 @@ typedef unsigned int GLhandleARB; + @@ -43414,7 +43471,27 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + @@ -45031,7 +45108,7 @@ typedef unsigned int GLhandleARB; - + @@ -45249,6 +45326,7 @@ typedef unsigned int GLhandleARB; + @@ -46530,6 +46608,9 @@ typedef unsigned int GLhandleARB; + + + @@ -46665,8 +46746,8 @@ typedef unsigned int GLhandleARB; - - + + @@ -46690,6 +46771,17 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + @@ -46701,8 +46793,7 @@ typedef unsigned int GLhandleARB; - - + @@ -46759,8 +46850,7 @@ typedef unsigned int GLhandleARB; - - + @@ -47435,6 +47525,5 @@ typedef unsigned int GLhandleARB; -