Merge branch 'master' into r300-compiler

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

1 files changed, 77 insertions, 70 deletions

diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 34c1e09ad83..5b2c9e4a9aa 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -764,23 +764,30 @@ gl_dispatch_functions_start:
 	GL_STUB(glBindVertexArray, _gloffset_BindVertexArray)
 	GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
+	GL_STUB(glClientWaitSync, _gloffset_ClientWaitSync)
+	GL_STUB(glDeleteSync, _gloffset_DeleteSync)
+	GL_STUB(glFenceSync, _gloffset_FenceSync)
+	GL_STUB(glGetInteger64v, _gloffset_GetInteger64v)
+	GL_STUB(glGetSynciv, _gloffset_GetSynciv)
+	GL_STUB(glIsSync, _gloffset_IsSync)
+	GL_STUB(glWaitSync, _gloffset_WaitSync)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS)
-	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_571)
-	GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS)
-	HIDDEN(gl_dispatch_stub_572)
-	GL_STUB(gl_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_573)
-	GL_STUB(gl_dispatch_stub_574, _gloffset_SampleMaskSGIS)
-	HIDDEN(gl_dispatch_stub_574)
-	GL_STUB(gl_dispatch_stub_575, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_575)
+	GL_STUB(gl_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_576)
+	GL_STUB(gl_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS)
+	HIDDEN(gl_dispatch_stub_577)
+	GL_STUB(gl_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS)
+	HIDDEN(gl_dispatch_stub_578)
+	GL_STUB(gl_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS)
+	HIDDEN(gl_dispatch_stub_579)
+	GL_STUB(gl_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_580)
+	GL_STUB(gl_dispatch_stub_581, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_581)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_582)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -791,10 +798,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_586, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_586)
-	GL_STUB(gl_dispatch_stub_587, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_587)
+	GL_STUB(gl_dispatch_stub_593, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_593)
+	GL_STUB(gl_dispatch_stub_594, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_594)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -819,8 +826,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_612)
+	GL_STUB(gl_dispatch_stub_619, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_619)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -862,24 +869,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV)
-	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV)
-	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV)
-	HIDDEN(gl_dispatch_stub_658)
-	GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV)
-	HIDDEN(gl_dispatch_stub_659)
-	GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV)
-	HIDDEN(gl_dispatch_stub_660)
-	GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_661)
-	GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_662)
+	GL_STUB(gl_dispatch_stub_663, _gloffset_DeleteFencesNV)
+	HIDDEN(gl_dispatch_stub_663)
+	GL_STUB(gl_dispatch_stub_664, _gloffset_FinishFenceNV)
+	HIDDEN(gl_dispatch_stub_664)
+	GL_STUB(gl_dispatch_stub_665, _gloffset_GenFencesNV)
+	HIDDEN(gl_dispatch_stub_665)
+	GL_STUB(gl_dispatch_stub_666, _gloffset_GetFenceivNV)
+	HIDDEN(gl_dispatch_stub_666)
+	GL_STUB(gl_dispatch_stub_667, _gloffset_IsFenceNV)
+	HIDDEN(gl_dispatch_stub_667)
+	GL_STUB(gl_dispatch_stub_668, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_668)
+	GL_STUB(gl_dispatch_stub_669, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_669)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -960,26 +967,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_743)
-	GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_744)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_745)
-	GL_STUB(gl_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_746)
-	GL_STUB(gl_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_747)
+	GL_STUB(gl_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT)
+	HIDDEN(gl_dispatch_stub_750)
+	GL_STUB(gl_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_751)
+	GL_STUB(gl_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_752)
+	GL_STUB(gl_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_753)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_754)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_754, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_754)
-	GL_STUB(gl_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_755)
+	GL_STUB(gl_dispatch_stub_761, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_761)
+	GL_STUB(gl_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_762)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -997,28 +1004,28 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_775)
-	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_779)
-	GL_STUB(gl_dispatch_stub_780, _gloffset_StencilFuncSeparateATI)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_780)
-	GL_STUB(gl_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_781, _gloffset_BufferParameteriAPPLE)
 	HIDDEN(gl_dispatch_stub_781)
-	GL_STUB(gl_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_782)
-	GL_STUB(gl_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_783)
-	GL_STUB(gl_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT)
-	HIDDEN(gl_dispatch_stub_784)
+	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
+	GL_STUB(gl_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE)
+	HIDDEN(gl_dispatch_stub_785)
+	GL_STUB(gl_dispatch_stub_786, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_786)
+	GL_STUB(gl_dispatch_stub_787, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_787)
+	GL_STUB(gl_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_788)
+	GL_STUB(gl_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_789)
+	GL_STUB(gl_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_790)
+	GL_STUB(gl_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_791)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)