From: Brian Paul <brianp@vmware.com>
Date: Fri, 7 Aug 2009 16:49:38 +0000 (-0600)
Subject: st/mesa: remove redundant calls to _mesa_set_vp_override()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1359d69f11f2d81ad3a1d44b7f729ee243d7f53d;p=mesa.git

st/mesa: remove redundant calls to _mesa_set_vp_override()

Called from core Mesa now.
---

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index b39403129d0..d19a88fa7c1 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -804,8 +804,8 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
-   _mesa_set_vp_override( ctx, TRUE );
-   _mesa_update_state( ctx );
+   /* Mesa state should be up to date by now */
+   assert(ctx->NewState == 0x0);
 
    st_validate_state(st);
 
@@ -833,8 +833,6 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
          pipe_texture_reference(&pt, NULL);
       }
    }
-
-   _mesa_set_vp_override( ctx, FALSE );
 }