summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/softpipe
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/pipe/softpipe')
-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
3 files changed, 3 insertions, 3 deletions
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;