From: Henri Verbeet <hverbeet@gmail.com>
Date: Fri, 7 Jan 2011 16:06:11 +0000 (+0100)
Subject: r600g: Also set const_offset if the buffer is not a user buffer in r600_upload_const_... 
X-Git-Tag: android-x86-2.2-r2~1522
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82acc3b14c2e85b4367bcbbb50f6a7e946050b19;p=android-x86%2Fexternal-mesa.git

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

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 1b0000ba462..469c8195fe9 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;
 }