Mesa (master): radeonsi: Don't save/ restore FMASK sampler view states for u_blitter

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 6b5c802c30ada043ee31cc5e62249ff99bbc865f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b5c802c30ada043ee31cc5e62249ff99bbc865f

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 30 17:45:31 2013 +0200

radeonsi: Don't save/restore FMASK sampler view states for u_blitter

Fixes assertion failues in 24 piglit tests with
MESA_GL_VERSION_OVERRIDE=3.0, 12 of which are now passing.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/r600_blit.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c
index 92b5a15..20c1767 100644
--- a/src/gallium/drivers/radeonsi/r600_blit.c
+++ b/src/gallium/drivers/radeonsi/r600_blit.c
@@ -76,7 +76,8 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
 			(void**)rctx->samplers[PIPE_SHADER_FRAGMENT].samplers);
 
 		util_blitter_save_fragment_sampler_views(rctx->blitter,
-			util_last_bit(rctx->samplers[PIPE_SHADER_FRAGMENT].views.desc.enabled_mask),
+			util_last_bit(rctx->samplers[PIPE_SHADER_FRAGMENT].views.desc.enabled_mask &
+				      ((1 << NUM_TEX_UNITS) - 1)),
 			rctx->samplers[PIPE_SHADER_FRAGMENT].views.views);
 	}