diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-06 16:00:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-06 16:00:59 +0200 |
| commit | 788b9f4552ce114eb6d433bcb39e2de4acebef5d (patch) | |
| tree | c9c1dd2dfbddd353202e10dc5deb294bc6e528d1 /mesalib/src/mesa/vbo/vbo_exec_api.c | |
| parent | aacd7c23fef5e89f26b4d23964ac8ebe93fd9cbe (diff) | |
| parent | 53da0b7e7c183ea15692234332b3e337b3fb0cc0 (diff) | |
| download | vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.gz vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.bz2 vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/GL3.txt
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mapi/glapi/glapi_mapi_tmp.h
mesalib/src/mapi/glapi/glapi_sparc.S
mesalib/src/mapi/glapi/glapi_x86-64.S
mesalib/src/mapi/glapi/glapi_x86.S
mesalib/src/mapi/glapi/glapitable.h
mesalib/src/mapi/glapi/glapitemp.h
mesalib/src/mapi/glapi/glprocs.h
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/enums.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/remap_helper.h
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/vbo/vbo_attrib_tmp.h
mesalib/src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_exec_api.c')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_api.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index 8474c787a..cad7c4639 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -742,6 +742,51 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec ) vfmt->Indexf = vbo_Indexf; vfmt->Indexfv = vbo_Indexfv; + /* ARB_vertex_type_2_10_10_10_rev */ + vfmt->VertexP2ui = vbo_VertexP2ui; + vfmt->VertexP2uiv = vbo_VertexP2uiv; + vfmt->VertexP3ui = vbo_VertexP3ui; + vfmt->VertexP3uiv = vbo_VertexP3uiv; + vfmt->VertexP4ui = vbo_VertexP4ui; + vfmt->VertexP4uiv = vbo_VertexP4uiv; + + vfmt->TexCoordP1ui = vbo_TexCoordP1ui; + vfmt->TexCoordP1uiv = vbo_TexCoordP1uiv; + vfmt->TexCoordP2ui = vbo_TexCoordP2ui; + vfmt->TexCoordP2uiv = vbo_TexCoordP2uiv; + vfmt->TexCoordP3ui = vbo_TexCoordP3ui; + vfmt->TexCoordP3uiv = vbo_TexCoordP3uiv; + vfmt->TexCoordP4ui = vbo_TexCoordP4ui; + vfmt->TexCoordP4uiv = vbo_TexCoordP4uiv; + + vfmt->MultiTexCoordP1ui = vbo_MultiTexCoordP1ui; + vfmt->MultiTexCoordP1uiv = vbo_MultiTexCoordP1uiv; + vfmt->MultiTexCoordP2ui = vbo_MultiTexCoordP2ui; + vfmt->MultiTexCoordP2uiv = vbo_MultiTexCoordP2uiv; + vfmt->MultiTexCoordP3ui = vbo_MultiTexCoordP3ui; + vfmt->MultiTexCoordP3uiv = vbo_MultiTexCoordP3uiv; + vfmt->MultiTexCoordP4ui = vbo_MultiTexCoordP4ui; + vfmt->MultiTexCoordP4uiv = vbo_MultiTexCoordP4uiv; + + vfmt->NormalP3ui = vbo_NormalP3ui; + vfmt->NormalP3uiv = vbo_NormalP3uiv; + + vfmt->ColorP3ui = vbo_ColorP3ui; + vfmt->ColorP3uiv = vbo_ColorP3uiv; + vfmt->ColorP4ui = vbo_ColorP4ui; + vfmt->ColorP4uiv = vbo_ColorP4uiv; + + vfmt->SecondaryColorP3ui = vbo_SecondaryColorP3ui; + vfmt->SecondaryColorP3uiv = vbo_SecondaryColorP3uiv; + + vfmt->VertexAttribP1ui = vbo_VertexAttribP1ui; + vfmt->VertexAttribP1uiv = vbo_VertexAttribP1uiv; + vfmt->VertexAttribP2ui = vbo_VertexAttribP2ui; + vfmt->VertexAttribP2uiv = vbo_VertexAttribP2uiv; + vfmt->VertexAttribP3ui = vbo_VertexAttribP3ui; + vfmt->VertexAttribP3uiv = vbo_VertexAttribP3uiv; + vfmt->VertexAttribP4ui = vbo_VertexAttribP4ui; + vfmt->VertexAttribP4uiv = vbo_VertexAttribP4uiv; } |