Finishing up rename of the setup state to the rasterizer state.
This commit is contained in:
parent
fbb2f840ae
commit
de69fc1703
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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 );
|
||||
|
||||
|
|
|
@ -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: */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
@ -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 \
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
Loading…
Reference in New Issue