diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-19 09:15:34 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-19 09:15:34 -0600 |
| commit | 9038b6c8bbda49c544d777c7cf7b107887421c77 (patch) | |
| tree | 7cfbf496dbc029ca134ede4669511cd6e94ef85a /src/mesa/sparc | |
| parent | 0342229289c3bd5ed7bc595db4fc88003430209e (diff) | |
| parent | 0ddc4dbe43422211e6f3fb3278e7b2f55a25976b (diff) | |
Merge branch 'ext-provoking-vertex'
Conflicts:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
Diffstat (limited to 'src/mesa/sparc')
| -rw-r--r-- | src/mesa/sparc/glapi_sparc.S | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S index 1771c576ab..c1663dfc83 100644 --- a/src/mesa/sparc/glapi_sparc.S +++ b/src/mesa/sparc/glapi_sparc.S @@ -998,16 +998,17 @@ gl_dispatch_functions_start: GL_STUB(gl_dispatch_stub_771, _gloffset_BlitFramebufferEXT) HIDDEN(gl_dispatch_stub_771) GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT) - GL_STUB(gl_dispatch_stub_773, _gloffset_StencilFuncSeparateATI) - HIDDEN(gl_dispatch_stub_773) - GL_STUB(gl_dispatch_stub_774, _gloffset_ProgramEnvParameters4fvEXT) + 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_ProgramLocalParameters4fvEXT) + GL_STUB(gl_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT) HIDDEN(gl_dispatch_stub_775) - GL_STUB(gl_dispatch_stub_776, _gloffset_GetQueryObjecti64vEXT) + GL_STUB(gl_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT) HIDDEN(gl_dispatch_stub_776) - GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjectui64vEXT) + GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT) HIDDEN(gl_dispatch_stub_777) + GL_STUB(gl_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT) + HIDDEN(gl_dispatch_stub_778) GL_STUB_ALIAS(glArrayElementEXT, glArrayElement) GL_STUB_ALIAS(glBindTextureEXT, glBindTexture) GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays) |