Mesa (master): vbo: Remove vbo_save_vertex_list::attrtype.
Mathias Fröhlich
frohlich at kemper.freedesktop.org
Thu Mar 1 05:34:23 UTC 2018
Module: Mesa
Branch: master
Commit: 95b4be4f29fab106cee715dd96657be044e54654
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95b4be4f29fab106cee715dd96657be044e54654
Author: Mathias Fröhlich <mathias.froehlich at web.de>
Date: Sun Feb 25 18:01:07 2018 +0100
vbo: Remove vbo_save_vertex_list::attrtype.
Is not used anymore on replay, move the last use in display list
compilation to the original array in the display list compiler.
Reviewed-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
---
src/mesa/vbo/vbo_save.h | 1 -
src/mesa/vbo/vbo_save_api.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 4dd886eb12..3ccbfac7e2 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -62,7 +62,6 @@ struct vbo_save_copied_vtx {
*/
struct vbo_save_vertex_list {
GLubyte attrsz[VBO_ATTRIB_MAX];
- GLenum16 attrtype[VBO_ATTRIB_MAX];
GLuint vertex_size; /**< size in GLfloats */
struct gl_vertex_array_object *VAO[VP_MODE_MAX];
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 95593fc0a7..2263276a18 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -545,8 +545,6 @@ compile_vertex_list(struct gl_context *ctx)
*/
STATIC_ASSERT(sizeof(node->attrsz) == sizeof(save->attrsz));
memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));
- STATIC_ASSERT(sizeof(node->attrtype) == sizeof(save->attrtype));
- memcpy(node->attrtype, save->attrtype, sizeof(node->attrtype));
node->vertex_size = save->vertex_size;
node->buffer_offset =
(save->buffer_map - save->vertex_store->buffer_map) * sizeof(GLfloat);
@@ -582,7 +580,7 @@ compile_vertex_list(struct gl_context *ctx)
update_vao(ctx, vpm, &save->VAO[vpm],
save->vertex_store->bufferobj, buffer_offset,
node->vertex_size*sizeof(GLfloat), save->enabled,
- node->attrsz, node->attrtype, offsets);
+ node->attrsz, save->attrtype, offsets);
/* Reference the vao in the dlist */
node->VAO[vpm] = NULL;
_mesa_reference_vao(ctx, &node->VAO[vpm], save->VAO[vpm]);
More information about the mesa-commit
mailing list