Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

2 files changed, 82 insertions, 75 deletions

diff --git a/src/mesa/x86/Makefile b/src/mesa/x86/Makefile
index aa49a9134aa..69122c114b0 100644
--- a/src/mesa/x86/Makefile
+++ b/src/mesa/x86/Makefile
@@ -21,7 +21,7 @@ clean:
 
 
 gen_matypes: gen_matypes.c
-	$(HOST_CC) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
+	$(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
 
 # need some special rules here, unfortunately
 matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 204175b72da..46794adaf7a 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -718,23 +718,30 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(BindVertexArray, _gloffset_BindVertexArray, BindVertexArray@4)
 	GL_STUB(GenVertexArrays, _gloffset_GenVertexArrays, GenVertexArrays@8)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
+	GL_STUB(ClientWaitSync, _gloffset_ClientWaitSync, ClientWaitSync@12)
+	GL_STUB(DeleteSync, _gloffset_DeleteSync, DeleteSync@4)
+	GL_STUB(FenceSync, _gloffset_FenceSync, FenceSync@8)
+	GL_STUB(GetInteger64v, _gloffset_GetInteger64v, GetInteger64v@8)
+	GL_STUB(GetSynciv, _gloffset_GetSynciv, GetSynciv@20)
+	GL_STUB(IsSync, _gloffset_IsSync, IsSync@4)
+	GL_STUB(WaitSync, _gloffset_WaitSync, WaitSync@12)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_568@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_569@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_570@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_571@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
-	GL_STUB(_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_572@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
-	GL_STUB(_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_573@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@8))
-	GL_STUB(_dispatch_stub_574, _gloffset_SampleMaskSGIS, _dispatch_stub_574@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_574, _dispatch_stub_574@8))
-	GL_STUB(_dispatch_stub_575, _gloffset_SamplePatternSGIS, _dispatch_stub_575@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@4))
+	GL_STUB(_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_575@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@8))
+	GL_STUB(_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_576@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_576, _dispatch_stub_576@8))
+	GL_STUB(_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_577@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_577, _dispatch_stub_577@8))
+	GL_STUB(_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_578@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_578, _dispatch_stub_578@8))
+	GL_STUB(_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_579@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_579, _dispatch_stub_579@8))
+	GL_STUB(_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_580@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_580, _dispatch_stub_580@8))
+	GL_STUB(_dispatch_stub_581, _gloffset_SampleMaskSGIS, _dispatch_stub_581@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_581, _dispatch_stub_581@8))
+	GL_STUB(_dispatch_stub_582, _gloffset_SamplePatternSGIS, _dispatch_stub_582@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -745,10 +752,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_586, _gloffset_CullParameterdvEXT, _dispatch_stub_586@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_586, _dispatch_stub_586@8))
-	GL_STUB(_dispatch_stub_587, _gloffset_CullParameterfvEXT, _dispatch_stub_587@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@8))
+	GL_STUB(_dispatch_stub_593, _gloffset_CullParameterdvEXT, _dispatch_stub_593@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_593, _dispatch_stub_593@8))
+	GL_STUB(_dispatch_stub_594, _gloffset_CullParameterfvEXT, _dispatch_stub_594@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_594, _dispatch_stub_594@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -773,8 +780,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_612, _gloffset_PixelTexGenSGIX, _dispatch_stub_612@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_612, _dispatch_stub_612@4))
+	GL_STUB(_dispatch_stub_619, _gloffset_PixelTexGenSGIX, _dispatch_stub_619@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_619, _dispatch_stub_619@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -816,24 +823,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_654, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_654@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@20))
-	GL_STUB(_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_655@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@24))
-	GL_STUB(_dispatch_stub_656, _gloffset_DeleteFencesNV, _dispatch_stub_656@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_FinishFenceNV, _dispatch_stub_657@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
-	GL_STUB(_dispatch_stub_658, _gloffset_GenFencesNV, _dispatch_stub_658@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@8))
-	GL_STUB(_dispatch_stub_659, _gloffset_GetFenceivNV, _dispatch_stub_659@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@12))
-	GL_STUB(_dispatch_stub_660, _gloffset_IsFenceNV, _dispatch_stub_660@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
-	GL_STUB(_dispatch_stub_661, _gloffset_SetFenceNV, _dispatch_stub_661@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@8))
-	GL_STUB(_dispatch_stub_662, _gloffset_TestFenceNV, _dispatch_stub_662@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@4))
+	GL_STUB(_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_661@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@20))
+	GL_STUB(_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_662@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@24))
+	GL_STUB(_dispatch_stub_663, _gloffset_DeleteFencesNV, _dispatch_stub_663@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_663, _dispatch_stub_663@8))
+	GL_STUB(_dispatch_stub_664, _gloffset_FinishFenceNV, _dispatch_stub_664@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_664, _dispatch_stub_664@4))
+	GL_STUB(_dispatch_stub_665, _gloffset_GenFencesNV, _dispatch_stub_665@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_665, _dispatch_stub_665@8))
+	GL_STUB(_dispatch_stub_666, _gloffset_GetFenceivNV, _dispatch_stub_666@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_666, _dispatch_stub_666@12))
+	GL_STUB(_dispatch_stub_667, _gloffset_IsFenceNV, _dispatch_stub_667@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_667, _dispatch_stub_667@4))
+	GL_STUB(_dispatch_stub_668, _gloffset_SetFenceNV, _dispatch_stub_668@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_668, _dispatch_stub_668@8))
+	GL_STUB(_dispatch_stub_669, _gloffset_TestFenceNV, _dispatch_stub_669@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_669, _dispatch_stub_669@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -914,26 +921,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_743, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_743@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
-	GL_STUB(_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_744@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
-	GL_STUB(_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_745@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
-	GL_STUB(_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_746@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
-	GL_STUB(_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_747@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_747, _dispatch_stub_747@4))
+	GL_STUB(_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_750@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@4))
+	GL_STUB(_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_751@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@4))
+	GL_STUB(_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_752@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@8))
+	GL_STUB(_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_753@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
+	GL_STUB(_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_754@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@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_754, _gloffset_DepthBoundsEXT, _dispatch_stub_754@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@16))
-	GL_STUB(_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_755@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_755, _dispatch_stub_755@8))
+	GL_STUB(_dispatch_stub_761, _gloffset_DepthBoundsEXT, _dispatch_stub_761@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_761, _dispatch_stub_761@16))
+	GL_STUB(_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_762@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_762, _dispatch_stub_762@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -951,28 +958,28 @@ 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_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
-	GL_STUB(_dispatch_stub_774, _gloffset_BufferParameteriAPPLE, _dispatch_stub_774@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
-	GL_STUB(_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_775@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_BlitFramebufferEXT, _dispatch_stub_780@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@40))
+	GL_STUB(_dispatch_stub_781, _gloffset_BufferParameteriAPPLE, _dispatch_stub_781@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@12))
+	GL_STUB(_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_782@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_778@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
-	GL_STUB(_dispatch_stub_779, _gloffset_TextureRangeAPPLE, _dispatch_stub_779@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
-	GL_STUB(_dispatch_stub_780, _gloffset_StencilFuncSeparateATI, _dispatch_stub_780@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@16))
-	GL_STUB(_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_781@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@16))
-	GL_STUB(_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_782@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@16))
-	GL_STUB(_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_783@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@12))
-	GL_STUB(_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_784@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@12))
+	GL_STUB(_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_785@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
+	GL_STUB(_dispatch_stub_786, _gloffset_TextureRangeAPPLE, _dispatch_stub_786@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@12))
+	GL_STUB(_dispatch_stub_787, _gloffset_StencilFuncSeparateATI, _dispatch_stub_787@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@16))
+	GL_STUB(_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_788@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@16))
+	GL_STUB(_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_789@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@16))
+	GL_STUB(_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_790@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@12))
+	GL_STUB(_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_791@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_791, _dispatch_stub_791@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)