Mesa (master): r300g: fix pointer arithmetic with void* in transfer_inline_write
Marek Olšák
mareko at kemper.freedesktop.org
Fri Dec 3 05:10:44 UTC 2010
Module: Mesa
Branch: master
Commit: b088b255ecec68154d56db801151b5d7764b0837
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b088b255ecec68154d56db801151b5d7764b0837
Author: Marek Olšák <maraeo at gmail.com>
Date: Fri Dec 3 06:08:50 2010 +0100
r300g: fix pointer arithmetic with void* in transfer_inline_write
---
src/gallium/drivers/r300/r300_screen_buffer.h | 4 ++--
src/gallium/drivers/r300/r300_state.c | 2 +-
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 a184ead..0b3555d 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 d4e2063..092c032 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;
}
More information about the mesa-commit
mailing list