From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Thu, 13 May 2010 19:27:19 +0000 (+0100)
Subject: r600g: Fix buffer offsets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9abfc5ef60ba26505a333bdd0f17a83c90ce316a;p=mesa.git

r600g: Fix buffer offsets

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
---

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 634a02b686e..fd94c605bb1 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -151,7 +151,7 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
 	int write = 0;
 
 	if (rbuffer->pb) {
-		return pb_map(rbuffer->pb, transfer->usage) + transfer->box.x;
+		return (uint8_t*)pb_map(rbuffer->pb, transfer->usage) + transfer->box.x;
 	}
 	if (transfer->usage & PIPE_TRANSFER_DONTBLOCK) {
 		/* FIXME */
@@ -162,7 +162,7 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
 	if (radeon_bo_map(rscreen->rw, rbuffer->bo)) {
 		return NULL;
 	}
-	return rbuffer->bo->data + transfer->box.x;
+	return (uint8_t*)rbuffer->bo->data + transfer->box.x;
 }
 
 static void r600_buffer_transfer_unmap(struct pipe_context *pipe,