diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/src/mesa/vbo/vbo_save.h | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_save.h')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_save.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h index f33669670..750117b12 100644 --- a/mesalib/src/mesa/vbo/vbo_save.h +++ b/mesalib/src/mesa/vbo/vbo_save.h @@ -63,6 +63,7 @@ struct vbo_save_copied_vtx { */ struct vbo_save_vertex_list { GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLuint vertex_size; /* Copy of the final vertex from node->vertex_store->bufferobj. @@ -127,6 +128,7 @@ struct vbo_save_context { const struct gl_client_array *inputs[VBO_ATTRIB_MAX]; GLubyte attrsz[VBO_ATTRIB_MAX]; + GLenum attrtype[VBO_ATTRIB_MAX]; GLubyte active_sz[VBO_ATTRIB_MAX]; GLuint vertex_size; |