From 0268e8984cfee9dca38ec5e74af7a562377bf53a Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 17 Apr 2010 22:42:03 -0700 Subject: r300g: Cast rbuf->user_buffer to 'uint8_t *' before arithmetic. Fixes this SCons build error. "pointer of type 'void *' uses in arithmetic" --- src/gallium/drivers/r300/r300_screen_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3