diff options
author | Brian Paul <brianp@vmware.com> | 2009-06-26 17:49:14 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-06-26 17:49:14 -0600 |
commit | f57280cc7360d0eee40df6d34befbfad2288d297 (patch) | |
tree | ad561c76156356cfc377e57f0689348296828754 /src/mesa/sparc/glapi_sparc.S | |
parent | a18e209edb5348eb167e9d7184597031bbbbe622 (diff) | |
parent | b2a1ca4fcf1cd16f85404fc582cec14e28b79e07 (diff) |
Merge branch 'arb_vertex_array_object'
Diffstat (limited to 'src/mesa/sparc/glapi_sparc.S')
-rw-r--r-- | src/mesa/sparc/glapi_sparc.S | 96 |
1 files changed, 49 insertions, 47 deletions
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S index c1663dfc83..12d74fa4fb 100644 --- a/src/mesa/sparc/glapi_sparc.S +++ b/src/mesa/sparc/glapi_sparc.S @@ -761,24 +761,26 @@ gl_dispatch_functions_start: GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample) GL_STUB(glFlushMappedBufferRange, _gloffset_FlushMappedBufferRange) GL_STUB(glMapBufferRange, _gloffset_MapBufferRange) + GL_STUB(glBindVertexArray, _gloffset_BindVertexArray) + GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays) GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData) GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT) - GL_STUB(gl_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS) - HIDDEN(gl_dispatch_stub_566) - GL_STUB(gl_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS) - HIDDEN(gl_dispatch_stub_567) - GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS) + GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS) HIDDEN(gl_dispatch_stub_568) - GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS) + GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS) HIDDEN(gl_dispatch_stub_569) - GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS) + GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS) HIDDEN(gl_dispatch_stub_570) - GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS) + GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS) HIDDEN(gl_dispatch_stub_571) - GL_STUB(gl_dispatch_stub_572, _gloffset_SampleMaskSGIS) + GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS) HIDDEN(gl_dispatch_stub_572) - GL_STUB(gl_dispatch_stub_573, _gloffset_SamplePatternSGIS) + 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) + HIDDEN(gl_dispatch_stub_575) GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT) GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT) GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT) @@ -789,10 +791,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_584, _gloffset_CullParameterdvEXT) - HIDDEN(gl_dispatch_stub_584) - GL_STUB(gl_dispatch_stub_585, _gloffset_CullParameterfvEXT) - HIDDEN(gl_dispatch_stub_585) + 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(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT) GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT) GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT) @@ -817,8 +819,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_610, _gloffset_PixelTexGenSGIX) - HIDDEN(gl_dispatch_stub_610) + GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX) + HIDDEN(gl_dispatch_stub_612) GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT) GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV) GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV) @@ -860,24 +862,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_652, _gloffset_MultiModeDrawArraysIBM) - HIDDEN(gl_dispatch_stub_652) - GL_STUB(gl_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM) - HIDDEN(gl_dispatch_stub_653) - GL_STUB(gl_dispatch_stub_654, _gloffset_DeleteFencesNV) + GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM) HIDDEN(gl_dispatch_stub_654) - GL_STUB(gl_dispatch_stub_655, _gloffset_FinishFenceNV) + GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM) HIDDEN(gl_dispatch_stub_655) - GL_STUB(gl_dispatch_stub_656, _gloffset_GenFencesNV) + GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV) HIDDEN(gl_dispatch_stub_656) - GL_STUB(gl_dispatch_stub_657, _gloffset_GetFenceivNV) + GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV) HIDDEN(gl_dispatch_stub_657) - GL_STUB(gl_dispatch_stub_658, _gloffset_IsFenceNV) + GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV) HIDDEN(gl_dispatch_stub_658) - GL_STUB(gl_dispatch_stub_659, _gloffset_SetFenceNV) + GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV) HIDDEN(gl_dispatch_stub_659) - GL_STUB(gl_dispatch_stub_660, _gloffset_TestFenceNV) + GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV) HIDDEN(gl_dispatch_stub_660) + GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV) + HIDDEN(gl_dispatch_stub_661) + GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV) + HIDDEN(gl_dispatch_stub_662) GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV) GL_STUB(glBindProgramNV, _gloffset_BindProgramNV) GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV) @@ -958,26 +960,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_741, _gloffset_ActiveStencilFaceEXT) - HIDDEN(gl_dispatch_stub_741) - GL_STUB(gl_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE) - HIDDEN(gl_dispatch_stub_742) - GL_STUB(gl_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE) + GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT) HIDDEN(gl_dispatch_stub_743) - GL_STUB(gl_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE) + GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE) HIDDEN(gl_dispatch_stub_744) - GL_STUB(gl_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE) + 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(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_752, _gloffset_DepthBoundsEXT) - HIDDEN(gl_dispatch_stub_752) - GL_STUB(gl_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT) - HIDDEN(gl_dispatch_stub_753) + 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(glBindFramebufferEXT, _gloffset_BindFramebufferEXT) GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT) GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT) @@ -995,20 +997,20 @@ gl_dispatch_functions_start: GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT) GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT) GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT) - GL_STUB(gl_dispatch_stub_771, _gloffset_BlitFramebufferEXT) - HIDDEN(gl_dispatch_stub_771) + GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT) + HIDDEN(gl_dispatch_stub_773) GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT) GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT) - GL_STUB(gl_dispatch_stub_774, _gloffset_StencilFuncSeparateATI) - HIDDEN(gl_dispatch_stub_774) - GL_STUB(gl_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT) - HIDDEN(gl_dispatch_stub_775) - GL_STUB(gl_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT) + GL_STUB(gl_dispatch_stub_776, _gloffset_StencilFuncSeparateATI) HIDDEN(gl_dispatch_stub_776) - GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT) + GL_STUB(gl_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT) HIDDEN(gl_dispatch_stub_777) - GL_STUB(gl_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT) + GL_STUB(gl_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT) HIDDEN(gl_dispatch_stub_778) + GL_STUB(gl_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT) + HIDDEN(gl_dispatch_stub_779) + GL_STUB(gl_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT) + HIDDEN(gl_dispatch_stub_780) GL_STUB_ALIAS(glArrayElementEXT, glArrayElement) GL_STUB_ALIAS(glBindTextureEXT, glBindTexture) GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays) |