Fix bug #4681.

glDeleteTextures and glDeleteTexturesEXT were erroneously listed as
aliases of each other.  For anything /except/ GLX protocol they are
aliases.  This set of changes allows functions that are functionally
identical but have different GLX protocol to be listed as aliases.

When building with GLX_INDIRECT_RENDERING set, different static
functions are used.  These functions determine whether the current
context is direct rendering or not.  If the context is direct
rendering, the aliased function (e.g., glDeleteTextures in the case of
glDeleteTexturesEXT) is called.  If the context is not direct
rendering, the correct GLX protocol is sent.

For a deeper explanation of what is changed, please see:
http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions

1 files changed, 123 insertions, 93 deletions

diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index b78c204..bd3b755 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -684,51 +684,22 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetAttribLocationARB, _gloffset_GetAttribLocationARB, GetAttribLocationARB@8)
 	GL_STUB(DrawBuffersARB, _gloffset_DrawBuffersARB, DrawBuffersARB@8)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_543, _gloffset_GetHistogramEXT, _dispatch_stub_543@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_543, _dispatch_stub_543@20))
-	GL_STUB(_dispatch_stub_544, _gloffset_GetHistogramParameterfvEXT, _dispatch_stub_544@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_544, _dispatch_stub_544@12))
-	GL_STUB(_dispatch_stub_545, _gloffset_GetHistogramParameterivEXT, _dispatch_stub_545@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_545, _dispatch_stub_545@12))
-	GL_STUB(_dispatch_stub_546, _gloffset_GetMinmaxEXT, _dispatch_stub_546@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_546, _dispatch_stub_546@20))
-	GL_STUB(_dispatch_stub_547, _gloffset_GetMinmaxParameterfvEXT, _dispatch_stub_547@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_547, _dispatch_stub_547@12))
-	GL_STUB(_dispatch_stub_548, _gloffset_GetMinmaxParameterivEXT, _dispatch_stub_548@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_548, _dispatch_stub_548@12))
-	GL_STUB(_dispatch_stub_549, _gloffset_GetConvolutionFilterEXT, _dispatch_stub_549@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_549, _dispatch_stub_549@16))
-	GL_STUB(_dispatch_stub_550, _gloffset_GetConvolutionParameterfvEXT, _dispatch_stub_550@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_550, _dispatch_stub_550@12))
-	GL_STUB(_dispatch_stub_551, _gloffset_GetConvolutionParameterivEXT, _dispatch_stub_551@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_551, _dispatch_stub_551@12))
-	GL_STUB(_dispatch_stub_552, _gloffset_GetSeparableFilterEXT, _dispatch_stub_552@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_552, _dispatch_stub_552@24))
-	GL_STUB(_dispatch_stub_553, _gloffset_GetColorTableParameterfvSGI, _dispatch_stub_553@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_553, _dispatch_stub_553@12))
-	GL_STUB(_dispatch_stub_554, _gloffset_GetColorTableParameterivSGI, _dispatch_stub_554@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_554, _dispatch_stub_554@12))
-	GL_STUB(_dispatch_stub_555, _gloffset_GetColorTableSGI, _dispatch_stub_555@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_555, _dispatch_stub_555@16))
-	GL_STUB(_dispatch_stub_556, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_556@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_556, _dispatch_stub_556@8))
-	GL_STUB(_dispatch_stub_557, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_557@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_557, _dispatch_stub_557@8))
-	GL_STUB(_dispatch_stub_558, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_558@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_558, _dispatch_stub_558@8))
-	GL_STUB(_dispatch_stub_559, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_559@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_559, _dispatch_stub_559@8))
-	GL_STUB(_dispatch_stub_560, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_560@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_560, _dispatch_stub_560@8))
-	GL_STUB(_dispatch_stub_561, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_561@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_561, _dispatch_stub_561@8))
-	GL_STUB(AreTexturesResidentEXT, _gloffset_AreTexturesResidentEXT, AreTexturesResidentEXT@12)
-	GL_STUB(GenTexturesEXT, _gloffset_GenTexturesEXT, GenTexturesEXT@8)
-	GL_STUB(IsTextureEXT, _gloffset_IsTextureEXT, IsTextureEXT@4)
-	GL_STUB(_dispatch_stub_565, _gloffset_SampleMaskSGIS, _dispatch_stub_565@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_565, _dispatch_stub_565@8))
-	GL_STUB(_dispatch_stub_566, _gloffset_SamplePatternSGIS, _dispatch_stub_566@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@4))
+	GL_STUB(_dispatch_stub_543, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_543@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_543, _dispatch_stub_543@8))
+	GL_STUB(_dispatch_stub_544, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_544@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_544, _dispatch_stub_544@8))
+	GL_STUB(_dispatch_stub_545, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_545@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_545, _dispatch_stub_545@8))
+	GL_STUB(_dispatch_stub_546, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_546@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_546, _dispatch_stub_546@8))
+	GL_STUB(_dispatch_stub_547, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_547@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_547, _dispatch_stub_547@8))
+	GL_STUB(_dispatch_stub_548, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_548@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_548, _dispatch_stub_548@8))
+	GL_STUB(_dispatch_stub_549, _gloffset_SampleMaskSGIS, _dispatch_stub_549@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_549, _dispatch_stub_549@8))
+	GL_STUB(_dispatch_stub_550, _gloffset_SamplePatternSGIS, _dispatch_stub_550@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_550, _dispatch_stub_550@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -739,10 +710,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_577, _gloffset_CullParameterdvEXT, _dispatch_stub_577@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_577, _dispatch_stub_577@8))
-	GL_STUB(_dispatch_stub_578, _gloffset_CullParameterfvEXT, _dispatch_stub_578@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_578, _dispatch_stub_578@8))
+	GL_STUB(_dispatch_stub_561, _gloffset_CullParameterdvEXT, _dispatch_stub_561@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_561, _dispatch_stub_561@8))
+	GL_STUB(_dispatch_stub_562, _gloffset_CullParameterfvEXT, _dispatch_stub_562@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_562, _dispatch_stub_562@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -767,8 +738,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_603, _gloffset_PixelTexGenSGIX, _dispatch_stub_603@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_603, _dispatch_stub_603@4))
+	GL_STUB(_dispatch_stub_587, _gloffset_PixelTexGenSGIX, _dispatch_stub_587@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -810,24 +781,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_645, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_645@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_645, _dispatch_stub_645@20))
-	GL_STUB(_dispatch_stub_646, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_646@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_646, _dispatch_stub_646@24))
-	GL_STUB(_dispatch_stub_647, _gloffset_DeleteFencesNV, _dispatch_stub_647@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_647, _dispatch_stub_647@8))
-	GL_STUB(_dispatch_stub_648, _gloffset_FinishFenceNV, _dispatch_stub_648@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_648, _dispatch_stub_648@4))
-	GL_STUB(_dispatch_stub_649, _gloffset_GenFencesNV, _dispatch_stub_649@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_649, _dispatch_stub_649@8))
-	GL_STUB(_dispatch_stub_650, _gloffset_GetFenceivNV, _dispatch_stub_650@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_650, _dispatch_stub_650@12))
-	GL_STUB(_dispatch_stub_651, _gloffset_IsFenceNV, _dispatch_stub_651@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_651, _dispatch_stub_651@4))
-	GL_STUB(_dispatch_stub_652, _gloffset_SetFenceNV, _dispatch_stub_652@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@8))
-	GL_STUB(_dispatch_stub_653, _gloffset_TestFenceNV, _dispatch_stub_653@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@4))
+	GL_STUB(_dispatch_stub_629, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_629@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_629, _dispatch_stub_629@20))
+	GL_STUB(_dispatch_stub_630, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_630@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_630, _dispatch_stub_630@24))
+	GL_STUB(_dispatch_stub_631, _gloffset_DeleteFencesNV, _dispatch_stub_631@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_631, _dispatch_stub_631@8))
+	GL_STUB(_dispatch_stub_632, _gloffset_FinishFenceNV, _dispatch_stub_632@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_632, _dispatch_stub_632@4))
+	GL_STUB(_dispatch_stub_633, _gloffset_GenFencesNV, _dispatch_stub_633@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_633, _dispatch_stub_633@8))
+	GL_STUB(_dispatch_stub_634, _gloffset_GetFenceivNV, _dispatch_stub_634@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_634, _dispatch_stub_634@12))
+	GL_STUB(_dispatch_stub_635, _gloffset_IsFenceNV, _dispatch_stub_635@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_635, _dispatch_stub_635@4))
+	GL_STUB(_dispatch_stub_636, _gloffset_SetFenceNV, _dispatch_stub_636@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_636, _dispatch_stub_636@8))
+	GL_STUB(_dispatch_stub_637, _gloffset_TestFenceNV, _dispatch_stub_637@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_637, _dispatch_stub_637@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -908,26 +879,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_734, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_734@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_734, _dispatch_stub_734@4))
-	GL_STUB(_dispatch_stub_735, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_735@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_735, _dispatch_stub_735@4))
-	GL_STUB(_dispatch_stub_736, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_736@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_736, _dispatch_stub_736@8))
-	GL_STUB(_dispatch_stub_737, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_737@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_737, _dispatch_stub_737@8))
-	GL_STUB(_dispatch_stub_738, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_738@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
+	GL_STUB(_dispatch_stub_718, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_718@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_718, _dispatch_stub_718@4))
+	GL_STUB(_dispatch_stub_719, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_719@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_719, _dispatch_stub_719@4))
+	GL_STUB(_dispatch_stub_720, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_720@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_720, _dispatch_stub_720@8))
+	GL_STUB(_dispatch_stub_721, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_721@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_721, _dispatch_stub_721@8))
+	GL_STUB(_dispatch_stub_722, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_722@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_722, _dispatch_stub_722@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_745, _gloffset_DepthBoundsEXT, _dispatch_stub_745@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@16))
-	GL_STUB(_dispatch_stub_746, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_746@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
+	GL_STUB(_dispatch_stub_729, _gloffset_DepthBoundsEXT, _dispatch_stub_729@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_729, _dispatch_stub_729@16))
+	GL_STUB(_dispatch_stub_730, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_730@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_730, _dispatch_stub_730@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -945,25 +916,36 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_764, _gloffset_BlitFramebufferEXT, _dispatch_stub_764@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_764, _dispatch_stub_764@40))
-	GL_STUB(_dispatch_stub_765, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_765@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_765, _dispatch_stub_765@16))
-	GL_STUB(_dispatch_stub_766, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_766@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_766, _dispatch_stub_766@16))
-	GL_STUB(_dispatch_stub_767, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_767@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_767, _dispatch_stub_767@12))
-	GL_STUB(_dispatch_stub_768, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_768@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_768, _dispatch_stub_768@12))
+	GL_STUB(_dispatch_stub_748, _gloffset_BlitFramebufferEXT, _dispatch_stub_748@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_748, _dispatch_stub_748@40))
+	GL_STUB(_dispatch_stub_749, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_749@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_749, _dispatch_stub_749@16))
+	GL_STUB(_dispatch_stub_750, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_750@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@16))
+	GL_STUB(_dispatch_stub_751, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_751@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@12))
+	GL_STUB(_dispatch_stub_752, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_752@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(AreTexturesResidentEXT, _gloffset_AreTexturesResident, AreTexturesResidentEXT@12, AreTexturesResident, AreTexturesResident@12)
+#endif
 	GL_STUB_ALIAS(CopyTexImage1DEXT, _gloffset_CopyTexImage1D, CopyTexImage1DEXT@28, CopyTexImage1D, CopyTexImage1D@28)
 	GL_STUB_ALIAS(CopyTexImage2DEXT, _gloffset_CopyTexImage2D, CopyTexImage2DEXT@32, CopyTexImage2D, CopyTexImage2D@32)
 	GL_STUB_ALIAS(CopyTexSubImage1DEXT, _gloffset_CopyTexSubImage1D, CopyTexSubImage1DEXT@24, CopyTexSubImage1D, CopyTexSubImage1D@24)
 	GL_STUB_ALIAS(CopyTexSubImage2DEXT, _gloffset_CopyTexSubImage2D, CopyTexSubImage2DEXT@32, CopyTexSubImage2D, CopyTexSubImage2D@32)
+#ifndef GLX_INDIRECT_RENDERING
 	GL_STUB_ALIAS(DeleteTexturesEXT, _gloffset_DeleteTextures, DeleteTexturesEXT@8, DeleteTextures, DeleteTextures@8)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GenTexturesEXT, _gloffset_GenTextures, GenTexturesEXT@8, GenTextures, GenTextures@8)
+#endif
 	GL_STUB_ALIAS(GetPointervEXT, _gloffset_GetPointerv, GetPointervEXT@8, GetPointerv, GetPointerv@8)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(IsTextureEXT, _gloffset_IsTexture, IsTextureEXT@4, IsTexture, IsTexture@4)
+#endif
 	GL_STUB_ALIAS(PrioritizeTexturesEXT, _gloffset_PrioritizeTextures, PrioritizeTexturesEXT@12, PrioritizeTextures, PrioritizeTextures@12)
 	GL_STUB_ALIAS(TexSubImage1DEXT, _gloffset_TexSubImage1D, TexSubImage1DEXT@28, TexSubImage1D, TexSubImage1D@28)
 	GL_STUB_ALIAS(TexSubImage2DEXT, _gloffset_TexSubImage2D, TexSubImage2DEXT@36, TexSubImage2D, TexSubImage2D@36)
@@ -975,6 +957,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(ColorTableParameterfvSGI, _gloffset_ColorTableParameterfv, ColorTableParameterfvSGI@12, ColorTableParameterfv, ColorTableParameterfv@12)
 	GL_STUB_ALIAS(ColorTableParameterivSGI, _gloffset_ColorTableParameteriv, ColorTableParameterivSGI@12, ColorTableParameteriv, ColorTableParameteriv@12)
 	GL_STUB_ALIAS(CopyColorTableSGI, _gloffset_CopyColorTable, CopyColorTableSGI@20, CopyColorTable, CopyColorTable@20)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableSGI, _gloffset_GetColorTable, GetColorTableSGI@16, GetColorTable, GetColorTable@16)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableEXT, _gloffset_GetColorTable, GetColorTableEXT@16, GetColorTable, GetColorTable@16)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableParameterfvSGI, _gloffset_GetColorTableParameterfv, GetColorTableParameterfvSGI@12, GetColorTableParameterfv, GetColorTableParameterfv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv, GetColorTableParameterfvEXT@12, GetColorTableParameterfv, GetColorTableParameterfv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableParameterivSGI, _gloffset_GetColorTableParameteriv, GetColorTableParameterivSGI@12, GetColorTableParameteriv, GetColorTableParameteriv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv, GetColorTableParameterivEXT@12, GetColorTableParameteriv, GetColorTableParameteriv@12)
+#endif
 	GL_STUB_ALIAS(ColorSubTableEXT, _gloffset_ColorSubTable, ColorSubTableEXT@24, ColorSubTable, ColorSubTable@24)
 	GL_STUB_ALIAS(CopyColorSubTableEXT, _gloffset_CopyColorSubTable, CopyColorSubTableEXT@20, CopyColorSubTable, CopyColorSubTable@20)
 	GL_STUB_ALIAS(ConvolutionFilter1DEXT, _gloffset_ConvolutionFilter1D, ConvolutionFilter1DEXT@24, ConvolutionFilter1D, ConvolutionFilter1D@24)
@@ -985,7 +985,37 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(ConvolutionParameterivEXT, _gloffset_ConvolutionParameteriv, ConvolutionParameterivEXT@12, ConvolutionParameteriv, ConvolutionParameteriv@12)
 	GL_STUB_ALIAS(CopyConvolutionFilter1DEXT, _gloffset_CopyConvolutionFilter1D, CopyConvolutionFilter1DEXT@20, CopyConvolutionFilter1D, CopyConvolutionFilter1D@20)
 	GL_STUB_ALIAS(CopyConvolutionFilter2DEXT, _gloffset_CopyConvolutionFilter2D, CopyConvolutionFilter2DEXT@24, CopyConvolutionFilter2D, CopyConvolutionFilter2D@24)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetConvolutionFilterEXT, _gloffset_GetConvolutionFilter, GetConvolutionFilterEXT@16, GetConvolutionFilter, GetConvolutionFilter@16)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetConvolutionParameterfvEXT, _gloffset_GetConvolutionParameterfv, GetConvolutionParameterfvEXT@12, GetConvolutionParameterfv, GetConvolutionParameterfv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetConvolutionParameterivEXT, _gloffset_GetConvolutionParameteriv, GetConvolutionParameterivEXT@12, GetConvolutionParameteriv, GetConvolutionParameteriv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetSeparableFilterEXT, _gloffset_GetSeparableFilter, GetSeparableFilterEXT@24, GetSeparableFilter, GetSeparableFilter@24)
+#endif
 	GL_STUB_ALIAS(SeparableFilter2DEXT, _gloffset_SeparableFilter2D, SeparableFilter2DEXT@32, SeparableFilter2D, SeparableFilter2D@32)
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetHistogramEXT, _gloffset_GetHistogram, GetHistogramEXT@20, GetHistogram, GetHistogram@20)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetHistogramParameterfvEXT, _gloffset_GetHistogramParameterfv, GetHistogramParameterfvEXT@12, GetHistogramParameterfv, GetHistogramParameterfv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetHistogramParameterivEXT, _gloffset_GetHistogramParameteriv, GetHistogramParameterivEXT@12, GetHistogramParameteriv, GetHistogramParameteriv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetMinmaxEXT, _gloffset_GetMinmax, GetMinmaxEXT@20, GetMinmax, GetMinmax@20)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetMinmaxParameterfvEXT, _gloffset_GetMinmaxParameterfv, GetMinmaxParameterfvEXT@12, GetMinmaxParameterfv, GetMinmaxParameterfv@12)
+#endif
+#ifndef GLX_INDIRECT_RENDERING
+	GL_STUB_ALIAS(GetMinmaxParameterivEXT, _gloffset_GetMinmaxParameteriv, GetMinmaxParameterivEXT@12, GetMinmaxParameteriv, GetMinmaxParameteriv@12)
+#endif
 	GL_STUB_ALIAS(HistogramEXT, _gloffset_Histogram, HistogramEXT@16, Histogram, Histogram@16)
 	GL_STUB_ALIAS(MinmaxEXT, _gloffset_Minmax, MinmaxEXT@12, Minmax, Minmax@12)
 	GL_STUB_ALIAS(ResetHistogramEXT, _gloffset_ResetHistogram, ResetHistogramEXT@4, ResetHistogram, ResetHistogram@4)