From ed03747e6a1a0655bfd0b5e4a52455fbd37f97c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Thu, 2 Oct 2014 16:00:26 +0900 Subject: [PATCH] radeonsi: Clear sampler view flags when binding a buffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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" Reviewed-by: Marek Olšák --- 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 fc535d01a84..922703445be 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.30.2