r600g: allow constant buffers to be user buffers.

This provides an upload facility for the constant buffers since Marek's
constants in user buffers changes.

gears at least work on my evergreen now.

Signed-off-by: Dave Airlie <[email protected]>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index a17c54d6eeb..1b0000ba462 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -250,3 +250,27 @@ int r600_upload_user_buffers(struct r600_pipe_context *rctx)
 	}
 	return ret;
 }
+
+
+int r600_upload_const_buffer(struct r600_pipe_context *rctx, struct pipe_resource *cbuffer,
+			     uint32_t *const_offset)
+{
+	if (r600_buffer_is_user_buffer(cbuffer)) {
+		struct r600_resource_buffer *rbuffer = r600_buffer(cbuffer);
+		unsigned upload_offset;
+		int ret = 0;
+
+		ret = r600_upload_buffer(rctx->rupload_const,
+					 0, cbuffer->width0,
+					 rbuffer,
+					 &upload_offset,
+					 &rbuffer->r.bo_size,
+					 &rbuffer->r.bo);
+		if (ret)
+			return ret;
+		rbuffer->uploaded = TRUE;
+		*const_offset = upload_offset;
+	}
+
+	return 0;
+}