summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Verbeet <[email protected]>2011-01-07 17:06:11 +0100
committerHenri Verbeet <[email protected]>2011-01-07 18:21:12 +0100
commit82acc3b14c2e85b4367bcbbb50f6a7e946050b19 (patch)
tree4e92be8d1bb0a0aff7ffb477538bf31bf562bb91
parentf39dfa0ab08d1328110afb5ed0ed16a8b5e3fbda (diff)
r600g: Also set const_offset if the buffer is not a user buffer in r600_upload_const_buffer().
-rw-r--r--src/gallium/drivers/r600/r600_buffer.c2
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 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;
}