Mesa (gallium-stream-out): gallium: rename draw_auto to draw_stream_output, plus fix a comment
Zack Rusin
zack at kemper.freedesktop.org
Wed Jun 2 16:53:34 UTC 2010
Module: Mesa
Branch: gallium-stream-out
Commit: afa87162f19db1951afe6783830bf36b45a69c4a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=afa87162f19db1951afe6783830bf36b45a69c4a
Author: Zack Rusin <zack at kde.org>
Date: Wed Jun 2 12:57:58 2010 -0400
gallium: rename draw_auto to draw_stream_output, plus fix a comment
Brian spotted those
---
src/gallium/drivers/softpipe/sp_context.c | 2 +-
src/gallium/drivers/softpipe/sp_draw_arrays.c | 2 +-
src/gallium/drivers/softpipe/sp_state.h | 2 +-
src/gallium/include/pipe/p_context.h | 2 +-
src/gallium/include/pipe/p_state.h | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 38bc0d5..401a28a 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -276,7 +276,7 @@ softpipe_create_context( struct pipe_screen *screen,
softpipe->pipe.draw_range_elements = softpipe_draw_range_elements;
softpipe->pipe.draw_arrays_instanced = softpipe_draw_arrays_instanced;
softpipe->pipe.draw_elements_instanced = softpipe_draw_elements_instanced;
- softpipe->pipe.draw_auto = softpipe_draw_auto;
+ softpipe->pipe.draw_stream_output = softpipe_draw_stream_output;
softpipe->pipe.clear = softpipe_clear;
softpipe->pipe.flush = softpipe_flush;
diff --git a/src/gallium/drivers/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index 8fa7f9f..79daa68 100644
--- a/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
@@ -85,7 +85,7 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
}
void
-softpipe_draw_auto(struct pipe_context *pipe, unsigned mode)
+softpipe_draw_stream_output(struct pipe_context *pipe, unsigned mode)
{
struct softpipe_context *sp = softpipe_context(pipe);
struct draw_context *draw = sp->draw;
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 4ffa2b9..d0b73cc 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -250,7 +250,7 @@ softpipe_draw_elements_instanced(struct pipe_context *pipe,
unsigned startInstance,
unsigned instanceCount);
-void softpipe_draw_auto(struct pipe_context *pipe, unsigned mode);
+void softpipe_draw_stream_output(struct pipe_context *pipe, unsigned mode);
void
softpipe_map_transfers(struct softpipe_context *sp);
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index d25dfc6..40f5ee6 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -105,7 +105,7 @@ struct pipe_context {
/**
* Draw the stream output buffer at index 0
*/
- void (*draw_auto)( struct pipe_context *pipe, unsigned mode );
+ void (*draw_stream_output)( struct pipe_context *pipe, unsigned mode );
/*@}*/
/**
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 771bff5..5ed1cca 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -352,7 +352,6 @@ struct pipe_stream_output_state
int output_buffer[PIPE_MAX_SHADER_OUTPUTS];
/**< which register to grab each output from */
int register_index[PIPE_MAX_SHADER_OUTPUTS];
- /**< format for each output */
/**< TGSI_WRITEMASK signifying which components to output */
ubyte register_mask[PIPE_MAX_SHADER_OUTPUTS];
/**< number of outputs */
More information about the mesa-commit
mailing list