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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 48ea7f12ee..3b47785a9a 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 {