summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--src/mesa/pipe/i915simple/i915_context.c2
-rw-r--r--src/mesa/pipe/i915simple/i915_state.c2
-rw-r--r--src/mesa/pipe/softpipe/Makefile2
-rw-r--r--src/mesa/pipe/softpipe/sp_context.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_state_rasterizer.c (renamed from src/mesa/pipe/softpipe/sp_state_setup.c)2
-rw-r--r--src/mesa/sources2
-rw-r--r--src/mesa/state_tracker/st_atom_rasterizer.c (renamed from src/mesa/state_tracker/st_atom_setup.c)0
-rw-r--r--src/mesa/state_tracker/st_cb_feedback.c4
-rw-r--r--src/mesa/state_tracker/st_draw.c2
12 files changed, 21 insertions, 21 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: */
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index 6e48b3bd03..36372898ce 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -285,7 +285,7 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys,
*/
i915->draw = draw_create();
assert(i915->draw);
- draw_set_setup_stage(i915->draw, i915_draw_render_stage(i915));
+ draw_set_rasterize_stage(i915->draw, i915_draw_render_stage(i915));
i915_init_region_functions(i915);
i915_init_surface_functions(i915);
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index 00764902bc..1dfa10ab28 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -308,7 +308,7 @@ static void i915_bind_rasterizer_state( struct pipe_context *pipe,
i915->rasterizer = setup;
/* pass-through to draw module */
- draw_set_setup_state(i915->draw, setup);
+ draw_set_rasterizer_state(i915->draw, setup);
i915->dirty |= I915_NEW_RASTERIZER;
}
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile
index 401df1cfb7..0335f56b99 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -29,7 +29,7 @@ DRIVER_SOURCES = \
sp_state_feedback.c \
sp_state_fs.c \
sp_state_sampler.c \
- sp_state_setup.c \
+ sp_state_rasterizer.c \
sp_state_surface.c \
sp_state_vertex.c \
sp_tex_layout.c \
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 7753ce40d7..cf5fc2227e 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -318,7 +318,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
*/
softpipe->draw = draw_create();
assert(softpipe->draw);
- draw_set_setup_stage(softpipe->draw, sp_draw_render_stage(softpipe));
+ draw_set_rasterize_stage(softpipe->draw, sp_draw_render_stage(softpipe));
sp_init_region_functions(softpipe);
sp_init_surface_functions(softpipe);
diff --git a/src/mesa/pipe/softpipe/sp_state_setup.c b/src/mesa/pipe/softpipe/sp_state_rasterizer.c
index 6788396355..d832adb91b 100644
--- a/src/mesa/pipe/softpipe/sp_state_setup.c
+++ b/src/mesa/pipe/softpipe/sp_state_rasterizer.c
@@ -49,7 +49,7 @@ void softpipe_bind_rasterizer_state(struct pipe_context *pipe,
struct softpipe_context *softpipe = softpipe_context(pipe);
/* pass-through to draw module */
- draw_set_setup_state(softpipe->draw, setup);
+ draw_set_rasterizer_state(softpipe->draw, setup);
softpipe->rasterizer = setup;
diff --git a/src/mesa/sources b/src/mesa/sources
index 017a0167bd..0d4fdc15f4 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -203,7 +203,7 @@ STATETRACKER_SOURCES = \
state_tracker/st_atom_fs.c \
state_tracker/st_atom_sampler.c \
state_tracker/st_atom_scissor.c \
- state_tracker/st_atom_setup.c \
+ state_tracker/st_atom_rasterizer.c \
state_tracker/st_atom_stipple.c \
state_tracker/st_atom_texture.c \
state_tracker/st_atom_viewport.c \
diff --git a/src/mesa/state_tracker/st_atom_setup.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index cab8ad5cd6..cab8ad5cd6 100644
--- a/src/mesa/state_tracker/st_atom_setup.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index b97b2bb027..8e8084fe59 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -285,14 +285,14 @@ st_RenderMode(GLcontext *ctx, GLenum newMode )
else if (newMode == GL_SELECT) {
if (!st->selection_stage)
st->selection_stage = draw_glselect_stage(ctx, draw);
- draw_set_setup_stage(draw, st->selection_stage);
+ draw_set_rasterize_stage(draw, st->selection_stage);
/* Plug in new vbo draw function */
vbo->draw_prims = st_feedback_draw_vbo;
}
else {
if (!st->feedback_stage)
st->feedback_stage = draw_glfeedback_stage(ctx, draw);
- draw_set_setup_stage(draw, st->feedback_stage);
+ draw_set_rasterize_stage(draw, st->feedback_stage);
/* Plug in new vbo draw function */
vbo->draw_prims = st_feedback_draw_vbo;
}
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 1ea7799021..f68e449f07 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -394,7 +394,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
assert(draw);
draw_set_viewport_state(draw, &st->state.viewport);
draw_set_clip_state(draw, &st->state.clip);
- draw_set_setup_state(draw, st->state.rasterizer);
+ draw_set_rasterizer_state(draw, st->state.rasterizer);
draw_set_vertex_shader(draw, &st->state.vs);
/* XXX need to set vertex info too */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 15:44:22 +0000