projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge commit 'origin/7.8'
[mesa.git] / src / mesa / sparc / glapi_sparc.S
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 5b2c9e4a9aa264c4c286a1b8aad88e82369382d0..e9f887b78f2026175fda1f6619cae4c0902136f8 100644 (file)
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -627,6 +627,8 @@ gl_dispatch_functions_start:
        GL_STUB(glUniformMatrix3x4fv, _gloffset_UniformMatrix3x4fv)
        GL_STUB(glUniformMatrix4x2fv, _gloffset_UniformMatrix4x2fv)
        GL_STUB(glUniformMatrix4x3fv, _gloffset_UniformMatrix4x3fv)
+       GL_STUB(glDrawArraysInstanced, _gloffset_DrawArraysInstanced)
+       GL_STUB(glDrawElementsInstanced, _gloffset_DrawElementsInstanced)
        GL_STUB(glLoadTransposeMatrixdARB, _gloffset_LoadTransposeMatrixdARB)
        GL_STUB(glLoadTransposeMatrixfARB, _gloffset_LoadTransposeMatrixfARB)
        GL_STUB(glMultTransposeMatrixdARB, _gloffset_MultTransposeMatrixdARB)
@@ -771,23 +773,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)
-       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)
+       GL_STUB(gl_dispatch_stub_580, _gloffset_GetPixelTexGenParameterfvSGIS)
        HIDDEN(gl_dispatch_stub_580)
-       GL_STUB(gl_dispatch_stub_581, _gloffset_SampleMaskSGIS)
+       GL_STUB(gl_dispatch_stub_581, _gloffset_GetPixelTexGenParameterivSGIS)
        HIDDEN(gl_dispatch_stub_581)
-       GL_STUB(gl_dispatch_stub_582, _gloffset_SamplePatternSGIS)
+       GL_STUB(gl_dispatch_stub_582, _gloffset_PixelTexGenParameterfSGIS)
        HIDDEN(gl_dispatch_stub_582)
+       GL_STUB(gl_dispatch_stub_583, _gloffset_PixelTexGenParameterfvSGIS)
+       HIDDEN(gl_dispatch_stub_583)
+       GL_STUB(gl_dispatch_stub_584, _gloffset_PixelTexGenParameteriSGIS)
+       HIDDEN(gl_dispatch_stub_584)
+       GL_STUB(gl_dispatch_stub_585, _gloffset_PixelTexGenParameterivSGIS)
+       HIDDEN(gl_dispatch_stub_585)
+       GL_STUB(gl_dispatch_stub_586, _gloffset_SampleMaskSGIS)
+       HIDDEN(gl_dispatch_stub_586)
+       GL_STUB(gl_dispatch_stub_587, _gloffset_SamplePatternSGIS)
+       HIDDEN(gl_dispatch_stub_587)
        GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
        GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
        GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -798,10 +803,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_598, _gloffset_CullParameterdvEXT)
+       HIDDEN(gl_dispatch_stub_598)
+       GL_STUB(gl_dispatch_stub_599, _gloffset_CullParameterfvEXT)
+       HIDDEN(gl_dispatch_stub_599)
        GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
        GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
        GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -826,8 +831,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_624, _gloffset_PixelTexGenSGIX)
+       HIDDEN(gl_dispatch_stub_624)
        GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
        GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
        GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -869,24 +874,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)
-       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)
+       GL_STUB(gl_dispatch_stub_666, _gloffset_MultiModeDrawArraysIBM)
        HIDDEN(gl_dispatch_stub_666)
-       GL_STUB(gl_dispatch_stub_667, _gloffset_IsFenceNV)
+       GL_STUB(gl_dispatch_stub_667, _gloffset_MultiModeDrawElementsIBM)
        HIDDEN(gl_dispatch_stub_667)
-       GL_STUB(gl_dispatch_stub_668, _gloffset_SetFenceNV)
+       GL_STUB(gl_dispatch_stub_668, _gloffset_DeleteFencesNV)
        HIDDEN(gl_dispatch_stub_668)
-       GL_STUB(gl_dispatch_stub_669, _gloffset_TestFenceNV)
+       GL_STUB(gl_dispatch_stub_669, _gloffset_FinishFenceNV)
        HIDDEN(gl_dispatch_stub_669)
+       GL_STUB(gl_dispatch_stub_670, _gloffset_GenFencesNV)
+       HIDDEN(gl_dispatch_stub_670)
+       GL_STUB(gl_dispatch_stub_671, _gloffset_GetFenceivNV)
+       HIDDEN(gl_dispatch_stub_671)
+       GL_STUB(gl_dispatch_stub_672, _gloffset_IsFenceNV)
+       HIDDEN(gl_dispatch_stub_672)
+       GL_STUB(gl_dispatch_stub_673, _gloffset_SetFenceNV)
+       HIDDEN(gl_dispatch_stub_673)
+       GL_STUB(gl_dispatch_stub_674, _gloffset_TestFenceNV)
+       HIDDEN(gl_dispatch_stub_674)
        GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
        GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
        GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -967,26 +972,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)
-       HIDDEN(gl_dispatch_stub_753)
-       GL_STUB(gl_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE)
-       HIDDEN(gl_dispatch_stub_754)
+       GL_STUB(gl_dispatch_stub_755, _gloffset_ActiveStencilFaceEXT)
+       HIDDEN(gl_dispatch_stub_755)
+       GL_STUB(gl_dispatch_stub_756, _gloffset_BindVertexArrayAPPLE)
+       HIDDEN(gl_dispatch_stub_756)
+       GL_STUB(gl_dispatch_stub_757, _gloffset_DeleteVertexArraysAPPLE)
+       HIDDEN(gl_dispatch_stub_757)
+       GL_STUB(gl_dispatch_stub_758, _gloffset_GenVertexArraysAPPLE)
+       HIDDEN(gl_dispatch_stub_758)
+       GL_STUB(gl_dispatch_stub_759, _gloffset_IsVertexArrayAPPLE)
+       HIDDEN(gl_dispatch_stub_759)
        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_766, _gloffset_DepthBoundsEXT)
+       HIDDEN(gl_dispatch_stub_766)
+       GL_STUB(gl_dispatch_stub_767, _gloffset_BlendEquationSeparateEXT)
+       HIDDEN(gl_dispatch_stub_767)
        GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
        GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
        GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1004,28 +1009,48 @@ 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(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-       GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-       GL_STUB(gl_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE)
+       GL_STUB(gl_dispatch_stub_785, _gloffset_BlitFramebufferEXT)
        HIDDEN(gl_dispatch_stub_785)
-       GL_STUB(gl_dispatch_stub_786, _gloffset_TextureRangeAPPLE)
+       GL_STUB(gl_dispatch_stub_786, _gloffset_BufferParameteriAPPLE)
        HIDDEN(gl_dispatch_stub_786)
-       GL_STUB(gl_dispatch_stub_787, _gloffset_StencilFuncSeparateATI)
+       GL_STUB(gl_dispatch_stub_787, _gloffset_FlushMappedBufferRangeAPPLE)
        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(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+       GL_STUB(glColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT)
+       GL_STUB(glDisableIndexedEXT, _gloffset_DisableIndexedEXT)
+       GL_STUB(glEnableIndexedEXT, _gloffset_EnableIndexedEXT)
+       GL_STUB(glGetBooleanIndexedvEXT, _gloffset_GetBooleanIndexedvEXT)
+       GL_STUB(glGetIntegerIndexedvEXT, _gloffset_GetIntegerIndexedvEXT)
+       GL_STUB(glIsEnabledIndexedEXT, _gloffset_IsEnabledIndexedEXT)
+       GL_STUB(glBeginConditionalRenderNV, _gloffset_BeginConditionalRenderNV)
+       GL_STUB(glEndConditionalRenderNV, _gloffset_EndConditionalRenderNV)
+       GL_STUB(glBeginTransformFeedbackEXT, _gloffset_BeginTransformFeedbackEXT)
+       GL_STUB(glBindBufferBaseEXT, _gloffset_BindBufferBaseEXT)
+       GL_STUB(glBindBufferOffsetEXT, _gloffset_BindBufferOffsetEXT)
+       GL_STUB(glBindBufferRangeEXT, _gloffset_BindBufferRangeEXT)
+       GL_STUB(glEndTransformFeedbackEXT, _gloffset_EndTransformFeedbackEXT)
+       GL_STUB(glGetTransformFeedbackVaryingEXT, _gloffset_GetTransformFeedbackVaryingEXT)
+       GL_STUB(glTransformFeedbackVaryingsEXT, _gloffset_TransformFeedbackVaryingsEXT)
+       GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
+       GL_STUB(gl_dispatch_stub_805, _gloffset_GetTexParameterPointervAPPLE)
+       HIDDEN(gl_dispatch_stub_805)
+       GL_STUB(gl_dispatch_stub_806, _gloffset_TextureRangeAPPLE)
+       HIDDEN(gl_dispatch_stub_806)
+       GL_STUB(glGetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE)
+       GL_STUB(glObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE)
+       GL_STUB(glObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE)
+       GL_STUB(gl_dispatch_stub_810, _gloffset_StencilFuncSeparateATI)
+       HIDDEN(gl_dispatch_stub_810)
+       GL_STUB(gl_dispatch_stub_811, _gloffset_ProgramEnvParameters4fvEXT)
+       HIDDEN(gl_dispatch_stub_811)
+       GL_STUB(gl_dispatch_stub_812, _gloffset_ProgramLocalParameters4fvEXT)
+       HIDDEN(gl_dispatch_stub_812)
+       GL_STUB(gl_dispatch_stub_813, _gloffset_GetQueryObjecti64vEXT)
+       HIDDEN(gl_dispatch_stub_813)
+       GL_STUB(gl_dispatch_stub_814, _gloffset_GetQueryObjectui64vEXT)
+       HIDDEN(gl_dispatch_stub_814)
+       GL_STUB(glEGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES)
+       GL_STUB(glEGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES)
        GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
        GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
        GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
@@ -1158,6 +1183,10 @@ gl_dispatch_functions_start:
        GL_STUB_ALIAS(glMultiTexCoord4s, glMultiTexCoord4sARB)
        GL_STUB_ALIAS(glMultiTexCoord4sv, glMultiTexCoord4svARB)
        GL_STUB_ALIAS(glStencilOpSeparateATI, glStencilOpSeparate)
+       GL_STUB_ALIAS(glDrawArraysInstancedARB, glDrawArraysInstanced)
+       GL_STUB_ALIAS(glDrawArraysInstancedEXT, glDrawArraysInstanced)
+       GL_STUB_ALIAS(glDrawElementsInstancedARB, glDrawElementsInstanced)
+       GL_STUB_ALIAS(glDrawElementsInstancedEXT, glDrawElementsInstanced)
        GL_STUB_ALIAS(glLoadTransposeMatrixd, glLoadTransposeMatrixdARB)
        GL_STUB_ALIAS(glLoadTransposeMatrixf, glLoadTransposeMatrixfARB)
        GL_STUB_ALIAS(glMultTransposeMatrixd, glMultTransposeMatrixdARB)
@@ -1269,6 +1298,7 @@ gl_dispatch_functions_start:
        GL_STUB_ALIAS(glGetAttribLocation, glGetAttribLocationARB)
        GL_STUB_ALIAS(glDrawBuffers, glDrawBuffersARB)
        GL_STUB_ALIAS(glDrawBuffersATI, glDrawBuffersARB)
+       GL_STUB_ALIAS(glRenderbufferStorageMultisampleEXT, glRenderbufferStorageMultisample)
        GL_STUB_ALIAS(glPointParameterf, glPointParameterfEXT)
        GL_STUB_ALIAS(glPointParameterfARB, glPointParameterfEXT)
        GL_STUB_ALIAS(glPointParameterfSGIS, glPointParameterfEXT)
@@ -1359,6 +1389,13 @@ gl_dispatch_functions_start:
        GL_STUB_ALIAS(glIsRenderbuffer, glIsRenderbufferEXT)
        GL_STUB_ALIAS(glRenderbufferStorage, glRenderbufferStorageEXT)
        GL_STUB_ALIAS(glFramebufferTextureLayer, glFramebufferTextureLayerEXT)
+       GL_STUB_ALIAS(glBeginTransformFeedback, glBeginTransformFeedbackEXT)
+       GL_STUB_ALIAS(glBindBufferBase, glBindBufferBaseEXT)
+       GL_STUB_ALIAS(glBindBufferRange, glBindBufferRangeEXT)
+       GL_STUB_ALIAS(glEndTransformFeedback, glEndTransformFeedbackEXT)
+       GL_STUB_ALIAS(glGetTransformFeedbackVarying, glGetTransformFeedbackVaryingEXT)
+       GL_STUB_ALIAS(glTransformFeedbackVaryings, glTransformFeedbackVaryingsEXT)
+       GL_STUB_ALIAS(glProvokingVertex, glProvokingVertexEXT)
 
        .globl  gl_dispatch_functions_end
        HIDDEN(gl_dispatch_functions_end)