From: Eric Anholt <eric@anholt.net>
Date: Wed, 12 Oct 2011 23:55:23 +0000 (-0700)
Subject: swrast: Skip _swrast_validate_derived in _swrast_ReadPixels().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e51ef099034f8c0da4a782dfd0d92194e068d85;p=mesa.git

swrast: Skip _swrast_validate_derived in _swrast_ReadPixels().

None of the callgraph below this uses derived state (almost nothing
even dereferences the swrast context).

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index aabb1f31f60..b2585998306 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -608,7 +608,6 @@ _swrast_ReadPixels( struct gl_context *ctx,
 		    const struct gl_pixelstore_attrib *packing,
 		    GLvoid *pixels )
 {
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
    struct gl_pixelstore_attrib clippedPacking = *packing;
 
    if (ctx->NewState)
@@ -620,9 +619,6 @@ _swrast_ReadPixels( struct gl_context *ctx,
     */
    swrast_render_start(ctx);
 
-   if (swrast->NewState)
-      _swrast_validate_derived( ctx );
-
    /* Do all needed clipping here, so that we can forget about it later */
    if (_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) {