summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-04-17 22:42:03 -0700
committerVinson Lee <vlee@vmware.com>2010-04-17 22:44:35 -0700
commit0268e8984cfee9dca38ec5e74af7a562377bf53a (patch)
treef7f69bd1a64ba4ff51b2468943b369c2f47aa940 /src
parentfe52b585f21963962f16285036a1eb1934b34ad4 (diff)
r300g: Cast rbuf->user_buffer to 'uint8_t *' before arithmetic.
Fixes this SCons build error. "pointer of type 'void *' uses in arithmetic"
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r300/r300_screen_buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c
index ea10aeee24..739f723f16 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -156,7 +156,7 @@ r300_buffer_transfer_map( struct pipe_context *pipe,
unsigned i;
if (rbuf->user_buffer)
- return rbuf->user_buffer + transfer->box.x;
+ return (uint8_t *) rbuf->user_buffer + transfer->box.x;
if (rbuf->b.b.bind & PIPE_BIND_CONSTANT_BUFFER) {
goto just_map;