diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-04 20:30:29 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-04 20:30:29 +1000 |
| commit | e902d9091c048531cf76b1d9d034fb865b1a0f6e (patch) | |
| tree | 6594c42173c215b9b17ac904a7d05a1568d53d31 /src/mesa/state_tracker/st_atom_constbuf.c | |
| parent | bc67533f29abe578e2306be2a24db392a0c62fc4 (diff) | |
| parent | 7a7bce7b24ea4f63faa1d5bfe3f71d09b412c838 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_atom_constbuf.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_constbuf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index cd7372902b..03093579e1 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -71,13 +71,12 @@ void st_upload_constants( struct st_context *st, _mesa_load_state_parameters(st->ctx, params); - if (cbuf->buffer && cbuf->size != paramBytes) - pipe_buffer_reference( ws, &cbuf->buffer, NULL ); - - if (!cbuf->buffer) { - cbuf->buffer = ws->buffer_create(ws, 1, PIPE_BUFFER_USAGE_CONSTANT, - paramBytes); - } + /* We always need to get a new buffer, to keep the drivers simple and + * avoid gratuitous rendering synchronization. + */ + pipe_buffer_reference( ws, &cbuf->buffer, NULL ); + cbuf->buffer = ws->buffer_create( ws, 1, PIPE_BUFFER_USAGE_CONSTANT, + paramBytes ); if (0) { |