diff options
| author | Marek Olšák <[email protected]> | 2012-04-16 16:35:58 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-19 14:47:21 +0200 |
| commit | 8c990de0d682bbedfd7e1988d4f8948ea99b0cc3 (patch) | |
| tree | 8b8e1c28700eb711f3954d020dbb690b35d4ca77 /src/mesa/vbo/vbo_exec_api.c | |
| parent | fa48137f292bbf8cbcd65e9caf33633cddc96600 (diff) | |
vbo: remove vbo_context::generic_currval
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_exec_api.c')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 8a168043936..3f95410892e 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -1099,14 +1099,16 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) vbo->currval[VBO_ATTRIB_POS+i].BufferObj); } - memcpy(arrays + VERT_ATTRIB_GENERIC(0), vbo->generic_currval, + memcpy(arrays + VERT_ATTRIB_GENERIC(0), + &vbo->currval[VBO_ATTRIB_GENERIC0], VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0])); + for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) { struct gl_client_array *array; array = &arrays[VERT_ATTRIB_GENERIC(i)]; array->BufferObj = NULL; _mesa_reference_buffer_object(ctx, &array->BufferObj, - vbo->generic_currval[i].BufferObj); + vbo->currval[VBO_ATTRIB_GENERIC0+i].BufferObj); } } |