5 files changed, 18 insertions, 18 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 7a0aad0973..5bd652f3a3 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -70,9 +70,9 @@ struct pipe_context *softpipe_create( void )
    softpipe->pipe.set_clip_state = softpipe_set_clip_state;
    softpipe->pipe.set_clear_color_state = softpipe_set_clear_color_state;
    softpipe->pipe.set_depth_state = softpipe_set_depth_test_state;
-   softpipe->pipe.set_viewport = softpipe_set_viewport;
+   softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
    softpipe->pipe.set_setup_state = softpipe_set_setup_state;
-   softpipe->pipe.set_scissor_rect = softpipe_set_scissor_rect;
+   softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;
    softpipe->pipe.set_fs_state = softpipe_set_fs_state;
    softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
    softpipe->pipe.set_sampler_state = softpipe_set_sampler_state;
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 7ba78b8090..a8c952591e 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -74,19 +74,19 @@ struct softpipe_context {
 
    /* The most recent drawing state as set by the driver:
     */
-   struct pipe_framebuffer_state framebuffer;
-   struct pipe_viewport     viewport;
-   struct pipe_setup_state  setup;
-   struct pipe_fs_state     fs;
-   struct pipe_blend_state  blend;
    struct pipe_alpha_test_state alpha_test;
-   struct pipe_clip_state   clip;
-   struct pipe_clear_color_state   clear_color;
+   struct pipe_blend_state blend;
+   struct pipe_clear_color_state clear_color;
+   struct pipe_clip_state clip;
    struct pipe_depth_state depth_test;
-   struct pipe_scissor_rect scissor;
+   struct pipe_framebuffer_state framebuffer;
+   struct pipe_fs_state fs;
    struct pipe_poly_stipple poly_stipple;
+   struct pipe_scissor_state scissor;
    struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
+   struct pipe_setup_state setup;
    struct pipe_texture_object *texture[PIPE_MAX_SAMPLERS];
+   struct pipe_viewport_state viewport;
    GLuint dirty;
 
    /* Clip derived state:
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index 4086c16bcc..60c24885e4 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -53,8 +53,8 @@ void softpipe_set_clip_state( struct pipe_context *,
 void softpipe_set_depth_test_state( struct pipe_context *,
                                     const struct pipe_depth_state * );
 
-void softpipe_set_viewport( struct pipe_context *,
-			   const struct pipe_viewport * );
+void softpipe_set_viewport_state( struct pipe_context *,
+                                  const struct pipe_viewport_state * );
 
 void softpipe_set_setup_state( struct pipe_context *,
 			      const struct pipe_setup_state * );
@@ -67,8 +67,8 @@ void softpipe_set_texture_state( struct pipe_context *,
                                  GLuint unit,
                                  struct pipe_texture_object * );
 
-void softpipe_set_scissor_rect( struct pipe_context *,
-			       const struct pipe_scissor_rect * );
+void softpipe_set_scissor_state( struct pipe_context *,
+                                 const struct pipe_scissor_state * );
 
 void softpipe_set_fs_state( struct pipe_context *,
 			   const struct pipe_fs_state * );
diff --git a/src/mesa/pipe/softpipe/sp_state_clip.c b/src/mesa/pipe/softpipe/sp_state_clip.c
index 4b83f2b07e..c907550019 100644
--- a/src/mesa/pipe/softpipe/sp_state_clip.c
+++ b/src/mesa/pipe/softpipe/sp_state_clip.c
@@ -51,8 +51,8 @@ void softpipe_set_clip_state( struct pipe_context *pipe,
 /* Called when driver state tracker notices changes to the viewport
  * matrix:
  */
-void softpipe_set_viewport( struct pipe_context *pipe,
-			   const struct pipe_viewport *viewport )
+void softpipe_set_viewport_state( struct pipe_context *pipe,
+                                  const struct pipe_viewport_state *viewport )
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
diff --git a/src/mesa/pipe/softpipe/sp_state_setup.c b/src/mesa/pipe/softpipe/sp_state_setup.c
index a249ceb992..55803aeac5 100644
--- a/src/mesa/pipe/softpipe/sp_state_setup.c
+++ b/src/mesa/pipe/softpipe/sp_state_setup.c
@@ -103,8 +103,8 @@ void softpipe_set_setup_state( struct pipe_context *pipe,
 
 
 
-void softpipe_set_scissor_rect( struct pipe_context *pipe,
-			       const struct pipe_scissor_rect *scissor )
+void softpipe_set_scissor_state( struct pipe_context *pipe,
+                                 const struct pipe_scissor_state *scissor )
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);