From 82f64a68a4a621252111ff62fce4e85e14cdc822 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Feb 2015 13:16:06 +0100 Subject: [PATCH] radeonsi: fix a crash when binding a NULL sampler view list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_descriptors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 15b4da1e8c1..372782f49d9 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -404,7 +404,7 @@ static void si_set_sampler_views(struct pipe_context *ctx, for (i = 0; i < count; i++) { unsigned slot = start + i; - if (!views[i]) { + if (!views || !views[i]) { samplers->depth_texture_mask &= ~(1 << slot); samplers->compressed_colortex_mask &= ~(1 << slot); si_set_sampler_view(sctx, shader, slot, NULL, NULL); -- 2.30.2