Mesa (master): radeonsi: Clear sampler view flags when binding a buffer

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Oct  2 16:00:26 2014 +0900

radeonsi: Clear sampler view flags when binding a buffer

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-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at 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);
 		}
 	}