i965g: remove duplicate viewport state in brw_context

This commit is contained in:
Keith Whitwell 2009-11-05 19:58:02 +00:00
parent 8f0e51be47
commit 658da189b6
3 changed files with 3 additions and 6 deletions

View file

@ -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;

View file

@ -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.
*

View file

@ -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;