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/glapi/glapioffsets.h | |
| 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/glapi/glapioffsets.h')
| -rw-r--r-- | src/mesa/glapi/glapioffsets.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h index 580b6b66bc..bd0a53a58f 100644 --- a/src/mesa/glapi/glapioffsets.h +++ b/src/mesa/glapi/glapioffsets.h @@ -805,12 +805,13 @@ #define _gloffset_RenderbufferStorageEXT 770 #define _gloffset_BlitFramebufferEXT 771 #define _gloffset_FramebufferTextureLayerEXT 772 -#define _gloffset_StencilFuncSeparateATI 773 -#define _gloffset_ProgramEnvParameters4fvEXT 774 -#define _gloffset_ProgramLocalParameters4fvEXT 775 -#define _gloffset_GetQueryObjecti64vEXT 776 -#define _gloffset_GetQueryObjectui64vEXT 777 -#define _gloffset_FIRST_DYNAMIC 778 +#define _gloffset_ProvokingVertexEXT 773 +#define _gloffset_StencilFuncSeparateATI 774 +#define _gloffset_ProgramEnvParameters4fvEXT 775 +#define _gloffset_ProgramLocalParameters4fvEXT 776 +#define _gloffset_GetQueryObjecti64vEXT 777 +#define _gloffset_GetQueryObjectui64vEXT 778 +#define _gloffset_FIRST_DYNAMIC 779 #else @@ -1179,6 +1180,7 @@ #define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index] #define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index] #define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index] +#define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index] #define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index] #define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index] #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index] |