Module: Mesa
Branch: master
Commit: f741c1eed4559329a89fbf8da569889bbcdace26
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f741c1eed4559329a89fbf8da569889bbcdace26
Author: Michel Dänzer <daen...@vmware.com>
Date: Sat Oct 3 18:01:58 2009 +0200
swrast: Move up state validation in _swrast_ReadPixels.
This ensures the driver won't map the wrong set of textures.
---
src/mesa/swrast/s_readpix.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 48b9408..a1aeb2e 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -555,15 +555,15 @@ _swrast_ReadPixels( GLcontext *ctx,
SWcontext *swrast = SWRAST_CONTEXT(ctx);
struct gl_pixelstore_attrib clippedPacking = *packing;
+ if (ctx->NewState)
+ _mesa_update_state(ctx);
+
/* Need to do swrast_render_start() before clipping or anything else
* since this is where a driver may grab the hw lock and get an updated
* window size.
*/
swrast_render_start(ctx);
- if (ctx->NewState)
- _mesa_update_state(ctx);
-
if (swrast->NewState)
_swrast_validate_derived( ctx );
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
