From 143157eeffdb2dfd4b10c288ea21f6cd3f6eb84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 2 Mar 2021 02:33:36 -0500 Subject: radeonsi: don't crash on NULL images in si_check_needs_implicit_sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes CTS test: KHR-GL46.arrays_of_arrays_gl.AtomicUsage Fixes: bddc0e023c "radeonsi: fix read from compute / write from draw sync" Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Zoltán Böszörményi Part-of: --- src/gallium/drivers/radeonsi/si_compute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index e58958ab211..224aa6f4319 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -822,7 +822,7 @@ static bool si_check_needs_implicit_sync(struct si_context *sctx) } struct si_images *images = &sctx->images[PIPE_SHADER_COMPUTE]; - mask = u_bit_consecutive(0, info->base.num_images); + mask = u_bit_consecutive(0, info->base.num_images) & images->enabled_mask; while (mask) { int i = u_bit_scan(&mask); -- cgit v1.2.1