Module: Mesa Branch: staging/20.3 Commit: 143157eeffdb2dfd4b10c288ea21f6cd3f6eb84d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=143157eeffdb2dfd4b10c288ea21f6cd3f6eb84d
Author: Marek Olšák <[email protected]> Date: Tue Mar 2 02:33:36 2021 -0500 radeonsi: don't crash on NULL images in si_check_needs_implicit_sync 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 <[email protected]> Reviewed-by: Zoltán Böszörményi <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9677> --- 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
