rename a few structs (use _state suffix consistantly), reorder/sort fields in some structs

3 files changed, 12 insertions, 12 deletions

diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index 75bead388f3..05a9f3eed18 100644
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -42,7 +42,7 @@
 static void
 update_scissor( struct st_context *st )
 {
-   struct pipe_scissor_rect scissor;
+   struct pipe_scissor_state scissor;
    const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
 
    scissor.minx = 0;
@@ -69,7 +69,7 @@ update_scissor( struct st_context *st )
    if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {
       /* state has changed */
       st->state.scissor = scissor;  /* struct copy */
-      st->pipe->set_scissor_rect(st->pipe, &scissor); /* activate */
+      st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */
    }
 }
 
diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index 765bcf3647e..ac91f628aab 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -88,7 +88,7 @@ static void update_viewport( struct st_context *st )
       GLfloat half_height = ctx->Viewport.Height / 2.0;
       GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
 
-      struct pipe_viewport vp;
+      struct pipe_viewport_state vp;
       
       vp.scale[0] = half_width;
       vp.scale[1] = half_height * yScale;
@@ -102,7 +102,7 @@ static void update_viewport( struct st_context *st )
 
       if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) {
 	 st->state.viewport = vp;
-	 st->pipe->set_viewport(st->pipe, &vp);
+	 st->pipe->set_viewport_state(st->pipe, &vp);
       }
    }
 }
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 48ea7f12ee0..3b47785a9a7 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -65,19 +65,19 @@ struct st_context
     * though, we just shove random objects across the interface.  
     */
    struct {
-      struct pipe_framebuffer_state framebuffer;
-      struct pipe_viewport     viewport;
-      struct pipe_setup_state  setup;
-      struct pipe_fs_state     fs;
       struct pipe_alpha_test_state  alpha_test;
       struct pipe_blend_state  blend;
       struct pipe_clear_color_state clear_color;
-      struct pipe_clip_state   clip;
-      struct pipe_depth_state  depth;
-      struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
-      struct pipe_scissor_rect scissor;
+      struct pipe_clip_state clip;
+      struct pipe_depth_state depth;
+      struct pipe_framebuffer_state framebuffer;
+      struct pipe_fs_state     fs;
       struct pipe_poly_stipple poly_stipple;
+      struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
+      struct pipe_scissor_state scissor;
+      struct pipe_setup_state  setup;
       struct pipe_stencil_state stencil;
+      struct pipe_viewport_state viewport;
    } state;
 
    struct {