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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 93dbbe6ab77..b87c42844c4 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -87,8 +87,8 @@ struct pipe_context {
    void (*set_setup_state)( struct pipe_context *,
 			    const struct pipe_setup_state * );
 
-   void (*set_scissor_rect)( struct pipe_context *,
-			     const struct pipe_scissor_rect * );
+   void (*set_scissor_state)( struct pipe_context *,
+                              const struct pipe_scissor_state * );
 
    void (*set_stencil_state)( struct pipe_context *,
                               const struct pipe_stencil_state * );
@@ -101,8 +101,8 @@ struct pipe_context {
                               GLuint unit,
                               struct pipe_texture_object * );
 
-   void (*set_viewport)( struct pipe_context *,
-			 const struct pipe_viewport * );
+   void (*set_viewport_state)( struct pipe_context *,
+                               const struct pipe_viewport_state * );
 };