summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2013-04-26 14:45:06 +0200
committerMarek Olšák <[email protected]>2013-05-11 23:59:20 +0200
commitf486c52f9e798ea59582e3a346e8e01980550e0c (patch)
treec2579487dc4625428f9bf8089b3906c2d53c7d67 /src
parentb88cebb634d74772fa509f5ca88fb71d397b3d85 (diff)
st/mesa: remove dependency on _NEW_BUFFER_OBJECT for vertex arrays
_NEW_BUFFER_OBJECT means glBufferData was called. We can just set our own flag in BufferData. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_atom_array.c2
-rw-r--r--src/mesa/state_tracker/st_cb_bufferobjects.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 2437245bd25..87a0a17f1b9 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -589,7 +589,7 @@ static void update_array(struct st_context *st)
const struct st_tracked_state st_update_array = {
"st_update_array", /* name */
{ /* dirty */
- _NEW_BUFFER_OBJECT, /* mesa */
+ 0, /* mesa */
ST_NEW_VERTEX_ARRAYS | ST_NEW_VERTEX_PROGRAM, /* st */
},
update_array /* update */
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index c868d5e163e..2e5e253a41f 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -264,8 +264,8 @@ st_bufferobj_data(struct gl_context *ctx,
pipe_buffer_write(pipe, st_obj->buffer, 0, size, data);
}
- /* BufferData may change a uniform buffer, need to update it */
- st->dirty.st |= ST_NEW_UNIFORM_BUFFER;
+ /* BufferData may change an array or uniform buffer, need to update it */
+ st->dirty.st |= ST_NEW_VERTEX_ARRAYS | ST_NEW_UNIFORM_BUFFER;
return GL_TRUE;
}