Merge commit 'origin/master' into glsl-pp-rework-2

3 files changed, 66 insertions, 60 deletions

diff --git a/src/mesa/sparc/clip.S b/src/mesa/sparc/clip.S
index 208843c6069..dc239171ff9 100644
--- a/src/mesa/sparc/clip.S
+++ b/src/mesa/sparc/clip.S
@@ -58,7 +58,8 @@ clip_table:
 	.byte	31, 29, 31, 30, 27, 25, 27, 26
 
 /* GLvector4f *clip_vec, GLvector4f *proj_vec, 
-   GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask */
+   GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask,
+   GLboolean viewport_z_enable */
 
 	.align		64
 __pc_tramp:
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 5b2c9e4a9aa..50a20370349 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -771,23 +771,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetSynciv, _gloffset_GetSynciv)
 	GL_STUB(glIsSync, _gloffset_IsSync)
 	GL_STUB(glWaitSync, _gloffset_WaitSync)
+	GL_STUB(glDrawElementsBaseVertex, _gloffset_DrawElementsBaseVertex)
+	GL_STUB(glDrawRangeElementsBaseVertex, _gloffset_DrawRangeElementsBaseVertex)
+	GL_STUB(glMultiDrawElementsBaseVertex, _gloffset_MultiDrawElementsBaseVertex)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	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)
+	GL_STUB(gl_dispatch_stub_578, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_578)
-	GL_STUB(gl_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS)
+	GL_STUB(gl_dispatch_stub_579, _gloffset_GetPixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_579)
-	GL_STUB(gl_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_580, _gloffset_PixelTexGenParameterfSGIS)
 	HIDDEN(gl_dispatch_stub_580)
-	GL_STUB(gl_dispatch_stub_581, _gloffset_SampleMaskSGIS)
+	GL_STUB(gl_dispatch_stub_581, _gloffset_PixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_581)
-	GL_STUB(gl_dispatch_stub_582, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_PixelTexGenParameteriSGIS)
 	HIDDEN(gl_dispatch_stub_582)
+	GL_STUB(gl_dispatch_stub_583, _gloffset_PixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_583)
+	GL_STUB(gl_dispatch_stub_584, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_584)
+	GL_STUB(gl_dispatch_stub_585, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_585)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -798,10 +801,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_593, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_593)
-	GL_STUB(gl_dispatch_stub_594, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_594)
+	GL_STUB(gl_dispatch_stub_596, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_596)
+	GL_STUB(gl_dispatch_stub_597, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_597)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -826,8 +829,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_619, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_619)
+	GL_STUB(gl_dispatch_stub_622, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_622)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -869,24 +872,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_661, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_661)
-	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)
+	GL_STUB(gl_dispatch_stub_664, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_664)
-	GL_STUB(gl_dispatch_stub_665, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_665, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_665)
-	GL_STUB(gl_dispatch_stub_666, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_666, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_666)
-	GL_STUB(gl_dispatch_stub_667, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_667, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_667)
-	GL_STUB(gl_dispatch_stub_668, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_668, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_668)
-	GL_STUB(gl_dispatch_stub_669, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_669, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_669)
+	GL_STUB(gl_dispatch_stub_670, _gloffset_IsFenceNV)
+	HIDDEN(gl_dispatch_stub_670)
+	GL_STUB(gl_dispatch_stub_671, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_671)
+	GL_STUB(gl_dispatch_stub_672, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_672)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -967,26 +970,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_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)
+	GL_STUB(gl_dispatch_stub_753, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_753)
-	GL_STUB(gl_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_BindVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_754)
+	GL_STUB(gl_dispatch_stub_755, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_755)
+	GL_STUB(gl_dispatch_stub_756, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_756)
+	GL_STUB(gl_dispatch_stub_757, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_757)
 	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_761, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_761)
-	GL_STUB(gl_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_762)
+	GL_STUB(gl_dispatch_stub_764, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_764)
+	GL_STUB(gl_dispatch_stub_765, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_765)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1004,28 +1007,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_780, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_780)
-	GL_STUB(gl_dispatch_stub_781, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_781)
-	GL_STUB(gl_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_782)
+	GL_STUB(gl_dispatch_stub_783, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_783)
+	GL_STUB(gl_dispatch_stub_784, _gloffset_BufferParameteriAPPLE)
+	HIDDEN(gl_dispatch_stub_784)
+	GL_STUB(gl_dispatch_stub_785, _gloffset_FlushMappedBufferRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_785)
 	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)
+	GL_STUB(gl_dispatch_stub_788, _gloffset_GetTexParameterPointervAPPLE)
 	HIDDEN(gl_dispatch_stub_788)
-	GL_STUB(gl_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_789, _gloffset_TextureRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_789)
-	GL_STUB(gl_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_790, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_790)
-	GL_STUB(gl_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_791, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_791)
+	GL_STUB(gl_dispatch_stub_792, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_792)
+	GL_STUB(gl_dispatch_stub_793, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_793)
+	GL_STUB(gl_dispatch_stub_794, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_794)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index d2286a2c837..cea0c7cecf1 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -78,13 +78,15 @@ extern GLvector4f  *_mesa_sparc_cliptest_points4(GLvector4f *clip_vec,
 						 GLvector4f *proj_vec,
 						 GLubyte clipMask[],
 						 GLubyte *orMask,
-						 GLubyte *andMask);
+						 GLubyte *andMask,
+						 GLboolean viewport_z_clip);
 
 extern GLvector4f  *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec,
 						    GLvector4f *proj_vec,
 						    GLubyte clipMask[],
 						    GLubyte *orMask,
-						    GLubyte *andMask);
+						    GLubyte *andMask,
+						    GLboolean viewport_z_clip);
 
 #define NORM_ARGS	const GLmatrix *mat,				\
 			GLfloat scale,					\