converting the setup state to immutable object and renaming it to rasterizer state

3 files changed, 13 insertions, 13 deletions

diff --git a/src/mesa/pipe/failover/fo_context.h b/src/mesa/pipe/failover/fo_context.h
index 63ec7239ab..b05ceb88ad 100644
--- a/src/mesa/pipe/failover/fo_context.h
+++ b/src/mesa/pipe/failover/fo_context.h
@@ -37,7 +37,7 @@
 
 
 #define FO_NEW_VIEWPORT        0x1
-#define FO_NEW_SETUP           0x2
+#define FO_NEW_RASTERIZER      0x2
 #define FO_NEW_FRAGMENT_SHADER 0x4
 #define FO_NEW_BLEND           0x8
 #define FO_NEW_CLIP            0x10
@@ -66,9 +66,10 @@ struct failover_context {
 
    /* The most recent drawing state as set by the driver:
     */
-   const struct pipe_blend_state *blend;
-   const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
+   const struct pipe_blend_state         *blend;
+   const struct pipe_sampler_state       *sampler[PIPE_MAX_SAMPLERS];
    const struct pipe_depth_stencil_state *depth_stencil;
+   const struct pipe_rasterizer_state    *rasterizer;
 
    struct pipe_alpha_test_state alpha_test;
    struct pipe_blend_color blend_color;
@@ -79,7 +80,6 @@ struct failover_context {
    struct pipe_shader_state vertex_shader;
    struct pipe_poly_stipple poly_stipple;
    struct pipe_scissor_state scissor;
-   struct pipe_setup_state setup;
    struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
diff --git a/src/mesa/pipe/failover/fo_state.c b/src/mesa/pipe/failover/fo_state.c
index 43b9757b31..8e2b649590 100644
--- a/src/mesa/pipe/failover/fo_state.c
+++ b/src/mesa/pipe/failover/fo_state.c
@@ -160,15 +160,15 @@ failover_set_polygon_stipple( struct pipe_context *pipe,
 
 
 
-static void 
-failover_set_setup_state( struct pipe_context *pipe,
-			     const struct pipe_setup_state *setup )
+static void
+failover_bind_rasterizer_state( struct pipe_context *pipe,
+                                const struct pipe_rasterizer_state *setup )
 {
    struct failover_context *failover = failover_context(pipe);
 
-   failover->setup = *setup; 
-   failover->dirty |= FO_NEW_SETUP;
-   failover->hw->set_setup_state( failover->hw, setup );
+   failover->rasterizer = setup;
+   failover->dirty |= FO_NEW_RASTERIZER;
+   failover->hw->bind_rasterizer_state( failover->hw, setup );
 }
 
 
@@ -257,6 +257,7 @@ failover_init_state_functions( struct failover_context *failover )
    failover->pipe.bind_blend_state = failover_bind_blend_state;
    failover->pipe.bind_sampler_state = failover_bind_sampler_state;
    failover->pipe.bind_depth_stencil_state = failover_bind_depth_stencil_state;
+   failover->pipe.bind_rasterizer_state = failover_bind_rasterizer_state;
 
    failover->pipe.set_alpha_test_state = failover_set_alpha_test_state;
    failover->pipe.set_blend_color = failover_set_blend_color;
@@ -267,7 +268,6 @@ failover_init_state_functions( struct failover_context *failover )
    failover->pipe.set_vs_state = failover_set_vs_state;
    failover->pipe.set_polygon_stipple = failover_set_polygon_stipple;
    failover->pipe.set_scissor_state = failover_set_scissor_state;
-   failover->pipe.set_setup_state = failover_set_setup_state;
    failover->pipe.set_texture_state = failover_set_texture_state;
    failover->pipe.set_viewport_state = failover_set_viewport_state;
    failover->pipe.set_vertex_buffer = failover_set_vertex_buffer;
diff --git a/src/mesa/pipe/failover/fo_state_emit.c b/src/mesa/pipe/failover/fo_state_emit.c
index 3a1865d766..1c9573a7b0 100644
--- a/src/mesa/pipe/failover/fo_state_emit.c
+++ b/src/mesa/pipe/failover/fo_state_emit.c
@@ -85,8 +85,8 @@ failover_state_emit( struct failover_context *failover )
    if (failover->dirty & FO_NEW_STIPPLE)
       failover->sw->set_polygon_stipple( failover->sw, &failover->poly_stipple );
 
-   if (failover->dirty & FO_NEW_SETUP)
-      failover->sw->set_setup_state( failover->sw, &failover->setup );
+   if (failover->dirty & FO_NEW_RASTERIZER)
+      failover->sw->bind_rasterizer_state( failover->sw, failover->rasterizer );
 
    if (failover->dirty & FO_NEW_SCISSOR)
       failover->sw->set_scissor_state( failover->sw, &failover->scissor );