summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/draw
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2007-09-18 10:02:16 -0400
committerZack Rusin <zack@tungstengraphics.com>2007-09-18 10:02:16 -0400
commitde69fc1703f79e5c97e66b654de7a93b7abce8f0 (patch)
tree1e5755074add4101d85e85d096dd74b2e0a69939 /src/mesa/pipe/draw
parentfbb2f840aef9a540401575b032edb4dfdabd10bb (diff)
Finishing up rename of the setup state to the rasterizer state.
Diffstat (limited to 'src/mesa/pipe/draw')
-rw-r--r--src/mesa/pipe/draw/draw_context.c14
-rw-r--r--src/mesa/pipe/draw/draw_context.h8
-rw-r--r--src/mesa/pipe/draw/draw_private.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/pipe/draw/draw_context.c b/src/mesa/pipe/draw/draw_context.c
index f3236ad59e..9acbc53742 100644
--- a/src/mesa/pipe/draw/draw_context.c
+++ b/src/mesa/pipe/draw/draw_context.c
@@ -89,7 +89,7 @@ void draw_destroy( struct draw_context *draw )
*/
static void validate_pipeline( struct draw_context *draw )
{
- struct draw_stage *next = draw->pipeline.setup;
+ struct draw_stage *next = draw->pipeline.rasterize;
/*
* NOTE: we build up the pipeline in end-to-start order.
@@ -157,11 +157,11 @@ void draw_set_feedback_state( struct draw_context *draw,
/**
- * Register new primitive setup/rendering state.
+ * Register new primitive rasterization/rendering state.
* This causes the drawing pipeline to be rebuilt.
*/
-void draw_set_setup_state( struct draw_context *draw,
- const struct pipe_rasterizer_state *raster )
+void draw_set_rasterizer_state( struct draw_context *draw,
+ const struct pipe_rasterizer_state *raster )
{
draw->rasterizer = raster;
validate_pipeline( draw );
@@ -172,10 +172,10 @@ void draw_set_setup_state( struct draw_context *draw,
* Plug in the primitive rendering/rasterization stage.
* This is provided by the device driver.
*/
-void draw_set_setup_stage( struct draw_context *draw,
- struct draw_stage *stage )
+void draw_set_rasterize_stage( struct draw_context *draw,
+ struct draw_stage *stage )
{
- draw->pipeline.setup = stage;
+ draw->pipeline.rasterize = stage;
}
diff --git a/src/mesa/pipe/draw/draw_context.h b/src/mesa/pipe/draw/draw_context.h
index 2714252fc5..4eb59aab01 100644
--- a/src/mesa/pipe/draw/draw_context.h
+++ b/src/mesa/pipe/draw/draw_context.h
@@ -86,11 +86,11 @@ void draw_set_clip_state( struct draw_context *pipe,
void draw_set_feedback_state( struct draw_context *draw,
const struct pipe_feedback_state * );
-void draw_set_setup_state( struct draw_context *draw,
- const struct pipe_rasterizer_state *raster );
+void draw_set_rasterizer_state( struct draw_context *draw,
+ const struct pipe_rasterizer_state *raster );
-void draw_set_setup_stage( struct draw_context *draw,
- struct draw_stage *stage );
+void draw_set_rasterize_stage( struct draw_context *draw,
+ struct draw_stage *stage );
unsigned draw_prim_info( unsigned prim, unsigned *first, unsigned *incr );
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h
index fb0aaff40d..bd8c11eb94 100644
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/mesa/pipe/draw/draw_private.h
@@ -133,7 +133,7 @@ struct draw_context
struct draw_stage *twoside;
struct draw_stage *offset;
struct draw_stage *unfilled;
- struct draw_stage *setup; /* aka render/rasterize */
+ struct draw_stage *rasterize;
} pipeline;
/* pipe state that we need: */