Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup_coef.c
	src/gallium/drivers/llvmpipe/lp_setup_coef.h
	src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_setup_tri.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.h

1 files changed, 40 insertions, 44 deletions

diff --git a/src/mapi/glapi/glapi_sparc.S b/src/mapi/glapi/glapi_sparc.S
index c353ece567f..da823282e54 100644
--- a/src/mapi/glapi/glapi_sparc.S
+++ b/src/mapi/glapi/glapi_sparc.S
@@ -813,10 +813,6 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_608, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_608)
-	GL_STUB(gl_dispatch_stub_609, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_609)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -841,8 +837,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_634, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_634)
+	GL_STUB(gl_dispatch_stub_632, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_632)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -884,24 +880,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_676, _gloffset_MultiModeDrawArraysIBM)
+	GL_STUB(gl_dispatch_stub_674, _gloffset_MultiModeDrawArraysIBM)
+	HIDDEN(gl_dispatch_stub_674)
+	GL_STUB(gl_dispatch_stub_675, _gloffset_MultiModeDrawElementsIBM)
+	HIDDEN(gl_dispatch_stub_675)
+	GL_STUB(gl_dispatch_stub_676, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_676)
-	GL_STUB(gl_dispatch_stub_677, _gloffset_MultiModeDrawElementsIBM)
+	GL_STUB(gl_dispatch_stub_677, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_677)
-	GL_STUB(gl_dispatch_stub_678, _gloffset_DeleteFencesNV)
+	GL_STUB(gl_dispatch_stub_678, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_678)
-	GL_STUB(gl_dispatch_stub_679, _gloffset_FinishFenceNV)
+	GL_STUB(gl_dispatch_stub_679, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_679)
-	GL_STUB(gl_dispatch_stub_680, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_680, _gloffset_IsFenceNV)
 	HIDDEN(gl_dispatch_stub_680)
-	GL_STUB(gl_dispatch_stub_681, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_681, _gloffset_SetFenceNV)
 	HIDDEN(gl_dispatch_stub_681)
-	GL_STUB(gl_dispatch_stub_682, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_682, _gloffset_TestFenceNV)
 	HIDDEN(gl_dispatch_stub_682)
-	GL_STUB(gl_dispatch_stub_683, _gloffset_SetFenceNV)
-	HIDDEN(gl_dispatch_stub_683)
-	GL_STUB(gl_dispatch_stub_684, _gloffset_TestFenceNV)
-	HIDDEN(gl_dispatch_stub_684)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -982,26 +978,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_765, _gloffset_ActiveStencilFaceEXT)
+	GL_STUB(gl_dispatch_stub_763, _gloffset_ActiveStencilFaceEXT)
+	HIDDEN(gl_dispatch_stub_763)
+	GL_STUB(gl_dispatch_stub_764, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_764)
+	GL_STUB(gl_dispatch_stub_765, _gloffset_DeleteVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_765)
-	GL_STUB(gl_dispatch_stub_766, _gloffset_BindVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_766, _gloffset_GenVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_766)
-	GL_STUB(gl_dispatch_stub_767, _gloffset_DeleteVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_767, _gloffset_IsVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_767)
-	GL_STUB(gl_dispatch_stub_768, _gloffset_GenVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_768)
-	GL_STUB(gl_dispatch_stub_769, _gloffset_IsVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_769)
 	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_776, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_777)
+	GL_STUB(gl_dispatch_stub_774, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_774)
+	GL_STUB(gl_dispatch_stub_775, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_775)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1019,12 +1015,12 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_795, _gloffset_BlitFramebufferEXT)
+	GL_STUB(gl_dispatch_stub_793, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_793)
+	GL_STUB(gl_dispatch_stub_794, _gloffset_BufferParameteriAPPLE)
+	HIDDEN(gl_dispatch_stub_794)
+	GL_STUB(gl_dispatch_stub_795, _gloffset_FlushMappedBufferRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_795)
-	GL_STUB(gl_dispatch_stub_796, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_796)
-	GL_STUB(gl_dispatch_stub_797, _gloffset_FlushMappedBufferRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_797)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
 	GL_STUB(glColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT)
 	GL_STUB(glDisableIndexedEXT, _gloffset_DisableIndexedEXT)
@@ -1042,23 +1038,23 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetTransformFeedbackVaryingEXT, _gloffset_GetTransformFeedbackVaryingEXT)
 	GL_STUB(glTransformFeedbackVaryingsEXT, _gloffset_TransformFeedbackVaryingsEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_815, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_815)
-	GL_STUB(gl_dispatch_stub_816, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_816)
+	GL_STUB(gl_dispatch_stub_813, _gloffset_GetTexParameterPointervAPPLE)
+	HIDDEN(gl_dispatch_stub_813)
+	GL_STUB(gl_dispatch_stub_814, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_814)
 	GL_STUB(glGetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE)
 	GL_STUB(glObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE)
 	GL_STUB(glObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE)
-	GL_STUB(gl_dispatch_stub_820, _gloffset_StencilFuncSeparateATI)
+	GL_STUB(gl_dispatch_stub_818, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_818)
+	GL_STUB(gl_dispatch_stub_819, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_819)
+	GL_STUB(gl_dispatch_stub_820, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_820)
-	GL_STUB(gl_dispatch_stub_821, _gloffset_ProgramEnvParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_821, _gloffset_GetQueryObjecti64vEXT)
 	HIDDEN(gl_dispatch_stub_821)
-	GL_STUB(gl_dispatch_stub_822, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_822, _gloffset_GetQueryObjectui64vEXT)
 	HIDDEN(gl_dispatch_stub_822)
-	GL_STUB(gl_dispatch_stub_823, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_823)
-	GL_STUB(gl_dispatch_stub_824, _gloffset_GetQueryObjectui64vEXT)
-	HIDDEN(gl_dispatch_stub_824)
 	GL_STUB(glEGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES)
 	GL_STUB(glEGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)