Mesa (master): radeon: Fix build.
Vinson Lee
vlee at kemper.freedesktop.org
Tue Mar 11 05:55:26 UTC 2014
Module: Mesa
Branch: master
Commit: e6c565fcc591f4856eff512f72e961ff0686475c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6c565fcc591f4856eff512f72e961ff0686475c
Author: Vinson Lee <vlee at freedesktop.org>
Date: Mon Mar 10 22:49:51 2014 -0700
radeon: Fix build.
Fix build error introduced with commit
dfa25ea5cd19d5a050a1c94bd7370a2259b9f007.
CC r600_streamout.lo
r600_streamout.c:108:6: error: conflicting types for 'r600_set_streamout_targets'
void r600_set_streamout_targets(struct pipe_context *ctx,
^
./r600_pipe_common.h:413:6: note: previous declaration is here
void r600_set_streamout_targets(struct pipe_context *ctx,
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76009
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
src/gallium/drivers/radeon/r600_pipe_common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index a178e9c..17867d3 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -413,7 +413,7 @@ void r600_streamout_buffers_dirty(struct r600_common_context *rctx);
void r600_set_streamout_targets(struct pipe_context *ctx,
unsigned num_targets,
struct pipe_stream_output_target **targets,
- unsigned *offset);
+ const unsigned *offset);
void r600_emit_streamout_end(struct r600_common_context *rctx);
void r600_streamout_init(struct r600_common_context *rctx);
More information about the mesa-commit
mailing list