Mesa (i965g-restart): i965g: remove duplicate viewport state in brw_context

[Keith Whitwell]

Module: Mesa
Branch: i965g-restart
Commit: 658da189b62c4086c08950f3da5767e628235b55
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=658da189b62c4086c08950f3da5767e628235b55

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Nov  5 19:58:02 2009 +0000

i965g: remove duplicate viewport state in brw_context

---

 src/gallium/drivers/i965/brw_cc.c       |    2 +-
 src/gallium/drivers/i965/brw_context.h  |    5 +----
 src/gallium/drivers/i965/brw_sf_state.c |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/i965/brw_cc.c b/src/gallium/drivers/i965/brw_cc.c
index 8e25fe8..ba16fc4 100644
--- a/src/gallium/drivers/i965/brw_cc.c
+++ b/src/gallium/drivers/i965/brw_cc.c
@@ -66,7 +66,7 @@ static enum pipe_error prepare_cc_vp( struct brw_context *brw )
    memset(&ccv, 0, sizeof(ccv));
 
    /* PIPE_NEW_VIEWPORT */
-   calc_sane_viewport( &brw->curr.vp, &svp );
+   calc_sane_viewport( &brw->curr.viewport, &svp );
 
    ccv.min_depth = svp.near;
    ccv.max_depth = svp.far;
diff --git a/src/gallium/drivers/i965/brw_context.h b/src/gallium/drivers/i965/brw_context.h
index f853255..177fe21 100644
--- a/src/gallium/drivers/i965/brw_context.h
+++ b/src/gallium/drivers/i965/brw_context.h
@@ -514,18 +514,15 @@ struct brw_context
       unsigned num_vertex_buffers;
 
       struct pipe_scissor_state scissor;
+      struct pipe_viewport_state viewport;
       struct pipe_framebuffer_state fb;
-      struct pipe_viewport_state vp;
       struct pipe_clip_state ucp;
       struct pipe_buffer *vertex_constants;
       struct pipe_buffer *fragment_constants;
 
-      struct pipe_viewport_state viewport;
       struct brw_blend_constant_color bcc;
       struct brw_polygon_stipple bps;
 
-      
-
       /**
        * Index buffer for this draw_prims call.
        *
diff --git a/src/gallium/drivers/i965/brw_sf_state.c b/src/gallium/drivers/i965/brw_sf_state.c
index f030f26..bd8fc65 100644
--- a/src/gallium/drivers/i965/brw_sf_state.c
+++ b/src/gallium/drivers/i965/brw_sf_state.c
@@ -41,7 +41,7 @@
 
 static enum pipe_error upload_sf_vp(struct brw_context *brw)
 {
-   const struct pipe_viewport_state *vp = &brw->curr.vp;
+   const struct pipe_viewport_state *vp = &brw->curr.viewport;
    const struct pipe_scissor_state *scissor = &brw->curr.scissor;
    struct brw_sf_viewport sfv;
    enum pipe_error ret;