From: Michel Dänzer Date: Fri, 30 Aug 2013 15:45:31 +0000 (+0200) Subject: radeonsi: Don't save/restore FMASK sampler view states for u_blitter X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b5c802c30ada043ee31cc5e62249ff99bbc865f;p=mesa.git 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 --- diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c index 92b5a153ec3..20c1767fff0 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); }