gallium: Always allocate new const buffers instead of modifying existing ones.

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 cd7372902b8..03093579e15 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)
       {