[Mesa-dev] [PATCH 2/2] radeonsi: Don't save/restore FMASK sampler view states for u_blitter

[Marek Olšák]

Reviewed-by: Marek Olšák <maraeo at gmail.com>

Marek

On Fri, Aug 30, 2013 at 5:48 PM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Fixes assertion failues in 24 piglit tests with
> MESA_GL_VERSION_OVERRIDE=3.0, 12 of which are now passing.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  src/gallium/drivers/radeonsi/r600_blit.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c
> index 692e00b..dceca3d 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);
>         }
>
> --
> 1.8.4.rc3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev