update function mangling and add comment about it to gl.h

diff --git a/include/GL/gl.h b/include/GL/gl.h
index b1cbb0e530c4382cce2ec290bdc54520244b3a9b..9bab8c51e281d12f1f5da68bd22356acd03917d2 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.0
+ * Version:  6.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -2223,6 +2223,13 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
 #endif /* GL_ATI_blend_equation_separate */
 
 
+/**
+ ** NOTE!!!!!  If you add new functions to this file, or update
+ ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
+ ** in that file for details.
+ **/
+
+
 /**********************************************************************
  * Begin system-specific stuff
  */

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 2116a87a6466dc7b1070ddc14444ad987fba7970..8d3306b9fb133e3a032a4512a6c6f1cfaf18844b 100644 (file)
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -49,12 +49,14 @@
 #define glArrayElement         MANGLE(ArrayElement)
 #define glArrayObjectATI               MANGLE(ArrayObjectATI)
 #define glAsyncMarkerSGIX              MANGLE(AsyncMarkerSGIX)
+#define glAttachObjectARB              MANGLE(AttachObjectARB)
 #define glBeginFragmentShaderATI               MANGLE(BeginFragmentShaderATI)
 #define glBegin                MANGLE(Begin)
 #define glBeginOcclusionQueryNV                MANGLE(BeginOcclusionQueryNV)
 #define glBeginQueryARB                MANGLE(BeginQueryARB)
 #define glBeginQuery           MANGLE(BeginQuery)
 #define glBeginVertexShaderEXT         MANGLE(BeginVertexShaderEXT)
+#define glBindAttribLocationARB                MANGLE(BindAttribLocationARB)
 #define glBindBufferARB                MANGLE(BindBufferARB)
 #define glBindBuffer           MANGLE(BindBuffer)
 #define glBindFragmentShaderATI                MANGLE(BindFragmentShaderATI)
@@ -85,6 +87,8 @@
 #define glBlendColor           MANGLE(BlendColor)
 #define glBlendEquationEXT             MANGLE(BlendEquationEXT)
 #define glBlendEquation                MANGLE(BlendEquation)
+#define glBlendEquationSeparateATI             MANGLE(BlendEquationSeparateATI)
+#define glBlendEquationSeparateEXT             MANGLE(BlendEquationSeparateEXT)
 #define glBlendFunc            MANGLE(BlendFunc)
 #define glBlendFuncSeparateEXT         MANGLE(BlendFuncSeparateEXT)
 #define glBlendFuncSeparateINGR                MANGLE(BlendFuncSeparateINGR)
@@ -174,6 +178,7 @@
 #define glCombinerParameteriNV         MANGLE(CombinerParameteriNV)
 #define glCombinerParameterivNV                MANGLE(CombinerParameterivNV)
 #define glCombinerStageParameterfvNV           MANGLE(CombinerStageParameterfvNV)
+#define glCompileShaderARB             MANGLE(CompileShaderARB)
 #define glCompressedTexImage1DARB              MANGLE(CompressedTexImage1DARB)
 #define glCompressedTexImage1D         MANGLE(CompressedTexImage1D)
 #define glCompressedTexImage2DARB              MANGLE(CompressedTexImage2DARB)
@@ -217,6 +222,8 @@
 #define glCopyTexSubImage2D            MANGLE(CopyTexSubImage2D)
 #define glCopyTexSubImage3DEXT         MANGLE(CopyTexSubImage3DEXT)
 #define glCopyTexSubImage3D            MANGLE(CopyTexSubImage3D)
+#define glCreateProgramObjectARB               MANGLE(CreateProgramObjectARB)
+#define glCreateShaderObjectARB                MANGLE(CreateShaderObjectARB)
 #define glCullFace             MANGLE(CullFace)
 #define glCullParameterdvEXT           MANGLE(CullParameterdvEXT)
 #define glCullParameterfvEXT           MANGLE(CullParameterfvEXT)
@@ -231,6 +238,7 @@
 #define glDeleteFencesNV               MANGLE(DeleteFencesNV)
 #define glDeleteFragmentShaderATI              MANGLE(DeleteFragmentShaderATI)
 #define glDeleteLists          MANGLE(DeleteLists)
+#define glDeleteObjectARB              MANGLE(DeleteObjectARB)
 #define glDeleteOcclusionQueriesNV             MANGLE(DeleteOcclusionQueriesNV)
 #define glDeleteProgramsARB            MANGLE(DeleteProgramsARB)
 #define glDeleteProgramsNV             MANGLE(DeleteProgramsNV)
@@ -244,6 +252,7 @@
 #define glDepthFunc            MANGLE(DepthFunc)
 #define glDepthMask            MANGLE(DepthMask)
 #define glDepthRange           MANGLE(DepthRange)
+#define glDetachObjectARB              MANGLE(DetachObjectARB)
 #define glDetailTexFuncSGIS            MANGLE(DetailTexFuncSGIS)
 #define glDisableClientState           MANGLE(DisableClientState)
 #define glDisable              MANGLE(Disable)
@@ -363,8 +372,12 @@
 #define glGenTextures          MANGLE(GenTextures)
 #define glGenVertexArraysAPPLE         MANGLE(GenVertexArraysAPPLE)
 #define glGenVertexShadersEXT          MANGLE(GenVertexShadersEXT)
+#define glGetActiveAttribARB           MANGLE(GetActiveAttribARB)
+#define glGetActiveUniformARB          MANGLE(GetActiveUniformARB)
 #define glGetArrayObjectfvATI          MANGLE(GetArrayObjectfvATI)
 #define glGetArrayObjectivATI          MANGLE(GetArrayObjectivATI)
+#define glGetAttachedObjectsARB                MANGLE(GetAttachedObjectsARB)
+#define glGetAttribLocationARB         MANGLE(GetAttribLocationARB)
 #define glGetBooleanv          MANGLE(GetBooleanv)
 #define glGetBufferParameterivARB              MANGLE(GetBufferParameterivARB)
 #define glGetBufferParameteriv         MANGLE(GetBufferParameteriv)
@@ -407,6 +420,7 @@
 #define glGetFragmentLightivSGIX               MANGLE(GetFragmentLightivSGIX)
 #define glGetFragmentMaterialfvSGIX            MANGLE(GetFragmentMaterialfvSGIX)
 #define glGetFragmentMaterialivSGIX            MANGLE(GetFragmentMaterialivSGIX)
+#define glGetHandleARB         MANGLE(GetHandleARB)
 #define glGetHistogramEXT              MANGLE(GetHistogramEXT)
 #define glGetHistogram         MANGLE(GetHistogram)
 #define glGetHistogramParameterfvEXT           MANGLE(GetHistogramParameterfvEXT)
@@ -415,6 +429,7 @@
 #define glGetHistogramParameteriv              MANGLE(GetHistogramParameteriv)
 #define glGetImageTransformParameterfvHP               MANGLE(GetImageTransformParameterfvHP)
 #define glGetImageTransformParameterivHP               MANGLE(GetImageTransformParameterivHP)
+#define glGetInfoLogARB                MANGLE(GetInfoLogARB)
 #define glGetInstrumentsSGIX           MANGLE(GetInstrumentsSGIX)
 #define glGetIntegerv          MANGLE(GetIntegerv)
 #define glGetInvariantBooleanvEXT              MANGLE(GetInvariantBooleanvEXT)
@@ -445,6 +460,8 @@
 #define glGetMinmaxParameteriv         MANGLE(GetMinmaxParameteriv)
 #define glGetObjectBufferfvATI         MANGLE(GetObjectBufferfvATI)
 #define glGetObjectBufferivATI         MANGLE(GetObjectBufferivATI)
+#define glGetObjectParameterfvARB              MANGLE(GetObjectParameterfvARB)
+#define glGetObjectParameterivARB              MANGLE(GetObjectParameterivARB)
 #define glGetOcclusionQueryivNV                MANGLE(GetOcclusionQueryivNV)
 #define glGetOcclusionQueryuivNV               MANGLE(GetOcclusionQueryuivNV)
 #define glGetPixelMapfv                MANGLE(GetPixelMapfv)
@@ -475,6 +492,7 @@
 #define glGetQueryObjectuiv            MANGLE(GetQueryObjectuiv)
 #define glGetSeparableFilterEXT                MANGLE(GetSeparableFilterEXT)
 #define glGetSeparableFilter           MANGLE(GetSeparableFilter)
+#define glGetShaderSourceARB           MANGLE(GetShaderSourceARB)
 #define glGetSharpenTexFuncSGIS                MANGLE(GetSharpenTexFuncSGIS)
 #define glGetString            MANGLE(GetString)
 #define glGetTexBumpParameterfvATI             MANGLE(GetTexBumpParameterfvATI)
@@ -491,6 +509,9 @@
 #define glGetTexParameterfv            MANGLE(GetTexParameterfv)
 #define glGetTexParameteriv            MANGLE(GetTexParameteriv)
 #define glGetTrackMatrixivNV           MANGLE(GetTrackMatrixivNV)
+#define glGetUniformfvARB              MANGLE(GetUniformfvARB)
+#define glGetUniformivARB              MANGLE(GetUniformivARB)
+#define glGetUniformLocationARB                MANGLE(GetUniformLocationARB)
 #define glGetVariantArrayObjectfvATI           MANGLE(GetVariantArrayObjectfvATI)
 #define glGetVariantArrayObjectivATI           MANGLE(GetVariantArrayObjectivATI)
 #define glGetVariantBooleanvEXT                MANGLE(GetVariantBooleanvEXT)
@@ -572,6 +593,7 @@
 #define glLightModeliv         MANGLE(LightModeliv)
 #define glLineStipple          MANGLE(LineStipple)
 #define glLineWidth            MANGLE(LineWidth)
+#define glLinkProgramARB               MANGLE(LinkProgramARB)
 #define glListBase             MANGLE(ListBase)
 #define glListParameterfSGIX           MANGLE(ListParameterfSGIX)
 #define glListParameterfvSGIX          MANGLE(ListParameterfvSGIX)
@@ -931,6 +953,7 @@
 #define glShaderOp1EXT         MANGLE(ShaderOp1EXT)
 #define glShaderOp2EXT         MANGLE(ShaderOp2EXT)
 #define glShaderOp3EXT         MANGLE(ShaderOp3EXT)
+#define glShaderSourceARB              MANGLE(ShaderSourceARB)
 #define glSharpenTexFuncSGIS           MANGLE(SharpenTexFuncSGIS)
 #define glSpriteParameterfSGIX         MANGLE(SpriteParameterfSGIX)
 #define glSpriteParameterfvSGIX                MANGLE(SpriteParameterfvSGIX)
@@ -1060,11 +1083,32 @@
 #define glTrackMatrixNV                MANGLE(TrackMatrixNV)
 #define glTranslated           MANGLE(Translated)
 #define glTranslatef           MANGLE(Translatef)
+#define glUniform1fARB         MANGLE(Uniform1fARB)
+#define glUniform1fvARB                MANGLE(Uniform1fvARB)
+#define glUniform1iARB         MANGLE(Uniform1iARB)
+#define glUniform1ivARB                MANGLE(Uniform1ivARB)
+#define glUniform2fARB         MANGLE(Uniform2fARB)
+#define glUniform2fvARB                MANGLE(Uniform2fvARB)
+#define glUniform2iARB         MANGLE(Uniform2iARB)
+#define glUniform2ivARB                MANGLE(Uniform2ivARB)
+#define glUniform3fARB         MANGLE(Uniform3fARB)
+#define glUniform3fvARB                MANGLE(Uniform3fvARB)
+#define glUniform3iARB         MANGLE(Uniform3iARB)
+#define glUniform3ivARB                MANGLE(Uniform3ivARB)
+#define glUniform4fARB         MANGLE(Uniform4fARB)
+#define glUniform4fvARB                MANGLE(Uniform4fvARB)
+#define glUniform4iARB         MANGLE(Uniform4iARB)
+#define glUniform4ivARB                MANGLE(Uniform4ivARB)
+#define glUniformMatrix2fvARB          MANGLE(UniformMatrix2fvARB)
+#define glUniformMatrix3fvARB          MANGLE(UniformMatrix3fvARB)
+#define glUniformMatrix4fvARB          MANGLE(UniformMatrix4fvARB)
 #define glUnlockArraysEXT              MANGLE(UnlockArraysEXT)
 #define glUnmapBufferARB               MANGLE(UnmapBufferARB)
 #define glUnmapBuffer          MANGLE(UnmapBuffer)
 #define glUnmapObjectBufferATI         MANGLE(UnmapObjectBufferATI)
 #define glUpdateObjectBufferATI                MANGLE(UpdateObjectBufferATI)
+#define glUseProgramObjectARB          MANGLE(UseProgramObjectARB)
+#define glValidateProgramARB           MANGLE(ValidateProgramARB)
 #define glVariantArrayObjectATI                MANGLE(VariantArrayObjectATI)
 #define glVariantbvEXT         MANGLE(VariantbvEXT)
 #define glVariantdvEXT         MANGLE(VariantdvEXT)