Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into...

[mesa.git] / include / GL / gl_mangle.h

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 5364842708b7940bdf71c34b3833e0d5489c3f1b..7416d5372cd5df1572a5561aa27729dcf145a147 100644 (file)
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -98,6 +98,7 @@
 #define glBlendFuncSeparateEXT         MANGLE(BlendFuncSeparateEXT)
 #define glBlendFuncSeparateINGR                MANGLE(BlendFuncSeparateINGR)
 #define glBlendFuncSeparate            MANGLE(BlendFuncSeparate)
+#define glBlitFramebufferEXT           MANGLE(BlitFramebufferEXT)
 #define glBufferDataARB                MANGLE(BufferDataARB)
 #define glBufferData           MANGLE(BufferData)
 #define glBufferSubDataARB             MANGLE(BufferSubDataARB)
@@ -108,6 +109,7 @@
 #define glClampColorARB                MANGLE(ClampColorARB)
 #define glClearAccum           MANGLE(ClearAccum)
 #define glClearColor           MANGLE(ClearColor)
+#define glClearDebugLogMESA            MANGLE(ClearDebugLogMESA)
 #define glClearDepth           MANGLE(ClearDepth)
 #define glClearIndex           MANGLE(ClearIndex)
 #define glClear                MANGLE(Clear)
@@ -230,6 +232,7 @@
 #define glCopyTexSubImage2D            MANGLE(CopyTexSubImage2D)
 #define glCopyTexSubImage3DEXT         MANGLE(CopyTexSubImage3DEXT)
 #define glCopyTexSubImage3D            MANGLE(CopyTexSubImage3D)
+#define glCreateDebugObjectMESA                MANGLE(CreateDebugObjectMESA)
 #define glCreateProgram                MANGLE(CreateProgram)
 #define glCreateProgramObjectARB               MANGLE(CreateProgramObjectARB)
 #define glCreateShader         MANGLE(CreateShader)
@@ -271,7 +274,6 @@
 #define glDetailTexFuncSGIS            MANGLE(DetailTexFuncSGIS)
 #define glDisableClientState           MANGLE(DisableClientState)
 #define glDisable              MANGLE(Disable)
-#define glDisableTraceMESA             MANGLE(DisableTraceMESA)
 #define glDisableVariantClientStateEXT         MANGLE(DisableVariantClientStateEXT)
 #define glDisableVertexAttribArrayARB          MANGLE(DisableVertexAttribArrayARB)
 #define glDisableVertexAttribArray             MANGLE(DisableVertexAttribArray)
@@ -299,7 +301,6 @@
 #define glElementPointerATI            MANGLE(ElementPointerATI)
 #define glEnableClientState            MANGLE(EnableClientState)
 #define glEnable               MANGLE(Enable)
-#define glEnableTraceMESA              MANGLE(EnableTraceMESA)
 #define glEnableVariantClientStateEXT          MANGLE(EnableVariantClientStateEXT)
 #define glEnableVertexAttribArrayARB           MANGLE(EnableVertexAttribArrayARB)
 #define glEnableVertexAttribArray              MANGLE(EnableVertexAttribArray)
@@ -309,7 +310,6 @@
 #define glEndOcclusionQueryNV          MANGLE(EndOcclusionQueryNV)
 #define glEndQueryARB          MANGLE(EndQueryARB)
 #define glEndQuery             MANGLE(EndQuery)
-#define glEndTraceMESA         MANGLE(EndTraceMESA)
 #define glEndVertexShaderEXT           MANGLE(EndVertexShaderEXT)
 #define glEvalCoord1d          MANGLE(EvalCoord1d)
 #define glEvalCoord1dv         MANGLE(EvalCoord1dv)
@@ -438,6 +438,8 @@
 #define glGetConvolutionParameterfv            MANGLE(GetConvolutionParameterfv)
 #define glGetConvolutionParameterivEXT         MANGLE(GetConvolutionParameterivEXT)
 #define glGetConvolutionParameteriv            MANGLE(GetConvolutionParameteriv)
+#define glGetDebugLogLengthMESA                MANGLE(GetDebugLogLengthMESA)
+#define glGetDebugLogMESA              MANGLE(GetDebugLogMESA)
 #define glGetDetailTexFuncSGIS         MANGLE(GetDetailTexFuncSGIS)
 #define glGetDoublev           MANGLE(GetDoublev)
 #define glGetError             MANGLE(GetError)
@@ -515,12 +517,15 @@
 #define glGetProgramNamedParameterfvNV         MANGLE(GetProgramNamedParameterfvNV)
 #define glGetProgramParameterdvNV              MANGLE(GetProgramParameterdvNV)
 #define glGetProgramParameterfvNV              MANGLE(GetProgramParameterfvNV)
+#define glGetProgramRegisterfvMESA             MANGLE(GetProgramRegisterfvMESA)
 #define glGetProgramStringARB          MANGLE(GetProgramStringARB)
 #define glGetProgramStringNV           MANGLE(GetProgramStringNV)
 #define glGetQueryivARB                MANGLE(GetQueryivARB)
 #define glGetQueryiv           MANGLE(GetQueryiv)
+#define glGetQueryObjecti64vEXT                MANGLE(GetQueryObjecti64vEXT)
 #define glGetQueryObjectivARB          MANGLE(GetQueryObjectivARB)
 #define glGetQueryObjectiv             MANGLE(GetQueryObjectiv)
+#define glGetQueryObjectui64vEXT               MANGLE(GetQueryObjectui64vEXT)
 #define glGetQueryObjectuivARB         MANGLE(GetQueryObjectuivARB)
 #define glGetQueryObjectuiv            MANGLE(GetQueryObjectuiv)
 #define glGetRenderbufferParameterivEXT                MANGLE(GetRenderbufferParameterivEXT)
@@ -773,7 +778,6 @@
 #define glMultTransposeMatrixf         MANGLE(MultTransposeMatrixf)
 #define glNewList              MANGLE(NewList)
 #define glNewObjectBufferATI           MANGLE(NewObjectBufferATI)
-#define glNewTraceMESA         MANGLE(NewTraceMESA)
 #define glNormal3b             MANGLE(Normal3b)
 #define glNormal3bv            MANGLE(Normal3bv)
 #define glNormal3d             MANGLE(Normal3d)
@@ -852,14 +856,17 @@
 #define glPrimitiveRestartNV           MANGLE(PrimitiveRestartNV)
 #define glPrioritizeTexturesEXT                MANGLE(PrioritizeTexturesEXT)
 #define glPrioritizeTextures           MANGLE(PrioritizeTextures)
+#define glProgramCallbackMESA          MANGLE(ProgramCallbackMESA)
 #define glProgramEnvParameter4dARB             MANGLE(ProgramEnvParameter4dARB)
 #define glProgramEnvParameter4dvARB            MANGLE(ProgramEnvParameter4dvARB)
 #define glProgramEnvParameter4fARB             MANGLE(ProgramEnvParameter4fARB)
 #define glProgramEnvParameter4fvARB            MANGLE(ProgramEnvParameter4fvARB)
+#define glProgramEnvParameters4fvEXT           MANGLE(ProgramEnvParameters4fvEXT)
 #define glProgramLocalParameter4dARB           MANGLE(ProgramLocalParameter4dARB)
 #define glProgramLocalParameter4dvARB          MANGLE(ProgramLocalParameter4dvARB)
 #define glProgramLocalParameter4fARB           MANGLE(ProgramLocalParameter4fARB)
 #define glProgramLocalParameter4fvARB          MANGLE(ProgramLocalParameter4fvARB)
+#define glProgramLocalParameters4fvEXT         MANGLE(ProgramLocalParameters4fvEXT)
 #define glProgramNamedParameter4dNV            MANGLE(ProgramNamedParameter4dNV)
 #define glProgramNamedParameter4dvNV           MANGLE(ProgramNamedParameter4dvNV)
 #define glProgramNamedParameter4fNV            MANGLE(ProgramNamedParameter4fNV)
@@ -912,6 +919,7 @@
 #define glRectsv               MANGLE(Rectsv)
 #define glReferencePlaneSGIX           MANGLE(ReferencePlaneSGIX)
 #define glRenderbufferStorageEXT               MANGLE(RenderbufferStorageEXT)
+#define glRenderbufferStorageMultisampleEXT            MANGLE(RenderbufferStorageMultisampleEXT)
 #define glRenderMode           MANGLE(RenderMode)
 #define glReplacementCodePointerSUN            MANGLE(ReplacementCodePointerSUN)
 #define glReplacementCodeubSUN         MANGLE(ReplacementCodeubSUN)
@@ -1011,6 +1019,7 @@
 #define glSpriteParameteriSGIX         MANGLE(SpriteParameteriSGIX)
 #define glSpriteParameterivSGIX                MANGLE(SpriteParameterivSGIX)
 #define glStartInstrumentsSGIX         MANGLE(StartInstrumentsSGIX)
+#define glStencilClearTagEXT           MANGLE(StencilClearTagEXT)
 #define glStencilFunc          MANGLE(StencilFunc)
 #define glStencilFuncSeparateATI               MANGLE(StencilFuncSeparateATI)
 #define glStencilFuncSeparate          MANGLE(StencilFuncSeparate)
@@ -1129,12 +1138,6 @@
 #define glTextureLightEXT              MANGLE(TextureLightEXT)
 #define glTextureMaterialEXT           MANGLE(TextureMaterialEXT)
 #define glTextureNormalEXT             MANGLE(TextureNormalEXT)
-#define glTraceAssertAttribMESA                MANGLE(TraceAssertAttribMESA)
-#define glTraceCommentMESA             MANGLE(TraceCommentMESA)
-#define glTraceListMESA                MANGLE(TraceListMESA)
-#define glTracePointerMESA             MANGLE(TracePointerMESA)
-#define glTracePointerRangeMESA                MANGLE(TracePointerRangeMESA)
-#define glTraceTextureMESA             MANGLE(TraceTextureMESA)
 #define glTrackMatrixNV                MANGLE(TrackMatrixNV)
 #define glTranslated           MANGLE(Translated)
 #define glTranslatef           MANGLE(Translatef)
@@ -1172,10 +1175,16 @@
 #define glUniform4iv           MANGLE(Uniform4iv)
 #define glUniformMatrix2fvARB          MANGLE(UniformMatrix2fvARB)
 #define glUniformMatrix2fv             MANGLE(UniformMatrix2fv)
+#define glUniformMatrix2x3fv           MANGLE(UniformMatrix2x3fv)
+#define glUniformMatrix2x4fv           MANGLE(UniformMatrix2x4fv)
 #define glUniformMatrix3fvARB          MANGLE(UniformMatrix3fvARB)
 #define glUniformMatrix3fv             MANGLE(UniformMatrix3fv)
+#define glUniformMatrix3x2fv           MANGLE(UniformMatrix3x2fv)
+#define glUniformMatrix3x4fv           MANGLE(UniformMatrix3x4fv)
 #define glUniformMatrix4fvARB          MANGLE(UniformMatrix4fvARB)
 #define glUniformMatrix4fv             MANGLE(UniformMatrix4fv)
+#define glUniformMatrix4x2fv           MANGLE(UniformMatrix4x2fv)
+#define glUniformMatrix4x3fv           MANGLE(UniformMatrix4x3fv)
 #define glUnlockArraysEXT              MANGLE(UnlockArraysEXT)
 #define glUnmapBufferARB               MANGLE(UnmapBufferARB)
 #define glUnmapBuffer          MANGLE(UnmapBuffer)