Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Thu, Oct 2, 2014 at 9:03 AM, Michel Dänzer <mic...@daenzer.net> wrote:
> From: Michel Dänzer <michel.daen...@amd.com>
>
> Fixes assertion failure while running the Unreal Engine 4 Elemental demo:
>
> .../si_blit.c:322:si_decompress_color_textures: Assertion `tex->cmask.size ||
> tex->fmask.size' failed.
>
> Cc: "10.2 10.3" <mesa-sta...@lists.freedesktop.org>
> Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
> ---
> src/gallium/drivers/radeonsi/si_descriptors.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c
> b/src/gallium/drivers/radeonsi/si_descriptors.c
> index fc535d0..9227034 100644
> --- a/src/gallium/drivers/radeonsi/si_descriptors.c
> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c
> @@ -422,6 +422,11 @@ static void si_set_sampler_views(struct pipe_context
> *ctx,
> si_set_sampler_view(sctx, shader,
> SI_FMASK_TEX_OFFSET + slot,
> NULL, NULL);
> }
> + } else {
> + samplers->depth_texture_mask &= ~(1 << slot);
> + samplers->compressed_colortex_mask &= ~(1 << slot);
> + si_set_sampler_view(sctx, shader, SI_FMASK_TEX_OFFSET
> + slot,
> + NULL, NULL);
> }
> }
>
> --
> 2.1.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
