radeonsi: don't create temporary user buffer for r600_upload_const_buffer

1 files changed, 4 insertions, 7 deletions

diff --git a/src/gallium/drivers/radeonsi/r600_state_common.c b/src/gallium/drivers/radeonsi/r600_state_common.c
index 63c07420915..53a34ef519c 100644
--- a/src/gallium/drivers/radeonsi/r600_state_common.c
+++ b/src/gallium/drivers/radeonsi/r600_state_common.c
@@ -439,15 +439,12 @@ void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index,
 		return;
 	}
 
-        if (cb->user_buffer) {
-           rbuffer = pipe_user_buffer_create(ctx->screen, cb->user_buffer,
-                                         cb->buffer_size,
-                                         PIPE_BIND_CONSTANT_BUFFER);
-        }
-
 	r600_inval_shader_cache(rctx);
 
-	r600_upload_const_buffer(rctx, &rbuffer, &offset);
+	if (cb->user_buffer)
+		r600_upload_const_buffer(rctx, &rbuffer, cb->user_buffer, cb->buffer_size, &offset);
+	else
+		offset = 0;
 	va_offset = r600_resource_va(ctx->screen, (void*)rbuffer);
 	va_offset += offset;
 	//va_offset >>= 8;