Merge remote branch 'origin/master' into pipe-video

[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 aaa17e6a3b9d694d8fdef094dd33807f3a48a6a5..3fbdb4abb370eca33adfbaa3f21e5751854fdc26 100644 (file)
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -1014,21 +1014,31 @@ gl_dispatch_functions_start:
        GL_STUB(gl_dispatch_stub_785, _gloffset_FlushMappedBufferRangeAPPLE)
        HIDDEN(gl_dispatch_stub_785)
        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(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-       GL_STUB(gl_dispatch_stub_788, _gloffset_GetTexParameterPointervAPPLE)
-       HIDDEN(gl_dispatch_stub_788)
-       GL_STUB(gl_dispatch_stub_789, _gloffset_TextureRangeAPPLE)
-       HIDDEN(gl_dispatch_stub_789)
-       GL_STUB(gl_dispatch_stub_790, _gloffset_StencilFuncSeparateATI)
-       HIDDEN(gl_dispatch_stub_790)
-       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(gl_dispatch_stub_796, _gloffset_GetTexParameterPointervAPPLE)
+       HIDDEN(gl_dispatch_stub_796)
+       GL_STUB(gl_dispatch_stub_797, _gloffset_TextureRangeAPPLE)
+       HIDDEN(gl_dispatch_stub_797)
+       GL_STUB(gl_dispatch_stub_798, _gloffset_StencilFuncSeparateATI)
+       HIDDEN(gl_dispatch_stub_798)
+       GL_STUB(gl_dispatch_stub_799, _gloffset_ProgramEnvParameters4fvEXT)
+       HIDDEN(gl_dispatch_stub_799)
+       GL_STUB(gl_dispatch_stub_800, _gloffset_ProgramLocalParameters4fvEXT)
+       HIDDEN(gl_dispatch_stub_800)
+       GL_STUB(gl_dispatch_stub_801, _gloffset_GetQueryObjecti64vEXT)
+       HIDDEN(gl_dispatch_stub_801)
+       GL_STUB(gl_dispatch_stub_802, _gloffset_GetQueryObjectui64vEXT)
+       HIDDEN(gl_dispatch_stub_802)
+       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)
@@ -1272,6 +1282,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)