i965g: remove duplicate viewport state in brw_context

diff --git a/src/gallium/drivers/i965/brw_cc.c b/src/gallium/drivers/i965/brw_cc.c
index 8e25fe85854ba10126cc1210de2adf0c8d3612a6..ba16fc4f6bd94ce9152c69e6d2821f6ddcdad774 100644 (file)
--- 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 f853255261d922328e2cd1e27215c35f8943daed..177fe2172de2f7363b2fe5ee2b2a00da875f61bd 100644 (file)
--- 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 f030f26c19f37746e1928db87505479be3381ab6..bd8fc65b9e7d49b5cf967197aed6f7ce6accfd59 100644 (file)
--- 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;