diff options
| author | Mathias Fröhlich <[email protected]> | 2018-02-25 18:01:07 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-03-01 04:06:23 +0100 |
| commit | 95b4be4f29fab106cee715dd96657be044e54654 (patch) | |
| tree | d81ee3ef2e91215ab57193c9e5a046421a16049f /src | |
| parent | 77df52cc4febb45008db4cfca3c144482a3a8578 (diff) | |
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 <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/vbo/vbo_save.h | 1 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 4dd886eb121..3ccbfac7e28 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 95593fc0a7b..2263276a18a 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]); |