summaryrefslogtreecommitdiff
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-12-03 06:08:50 +0100
committerMarek Olšák <maraeo@gmail.com>2010-12-03 06:08:50 +0100
commitb088b255ecec68154d56db801151b5d7764b0837 (patch)
tree6ce3323346d7a1d658d27aacc62930f60d212e23 /src/gallium/drivers
parentd531f9c2f5c78468d913fc509b223760ac1c1124 (diff)
r300g: fix pointer arithmetic with void* in transfer_inline_write
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/r300/r300_screen_buffer.h4
-rw-r--r--src/gallium/drivers/r300/r300_state.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index a184ead3a3..0b3555dd81 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -55,8 +55,8 @@ struct r300_buffer
enum r300_buffer_domain domain;
- void *user_buffer;
- void *constant_buffer;
+ uint8_t *user_buffer;
+ uint8_t *constant_buffer;
struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
unsigned num_ranges;
};
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index d4e2063558..092c032092 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1824,7 +1824,7 @@ static void r300_set_constant_buffer(struct pipe_context *pipe,
}
if (buf == NULL || buf->width0 == 0 ||
- (mapped = r300_buffer(buf)->constant_buffer) == NULL) {
+ (mapped = (uint32_t*)r300_buffer(buf)->constant_buffer) == NULL) {
return;
}