Mesa (master): r600g: Also set const_offset if the buffer is not a user buffer in r600_upload_const_buffer ().

[Henri Verbeet]

Module: Mesa
Branch: master
Commit: 82acc3b14c2e85b4367bcbbb50f6a7e946050b19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82acc3b14c2e85b4367bcbbb50f6a7e946050b19

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Fri Jan  7 17:06:11 2011 +0100

r600g: Also set const_offset if the buffer is not a user buffer in r600_upload_const_buffer().

---

 src/gallium/drivers/r600/r600_buffer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 1b0000b..469c819 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -270,7 +270,9 @@ int r600_upload_const_buffer(struct r600_pipe_context *rctx, struct pipe_resourc
 			return ret;
 		rbuffer->uploaded = TRUE;
 		*const_offset = upload_offset;
+		return 0;
 	}
 
+	*const_offset = 0;
 	return 0;
 }