diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2021-03-02 02:33:36 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-03 01:19:24 +0000 |
| commit | db67d9c0d11c886c5b960126b8bf0a230e65d980 (patch) | |
| tree | 642a33770197e2946b865835e1b66f1494178034 | |
| parent | f9e6c7a22063ca84794f474166cb7e3ad2da3901 (diff) | |
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 <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9361>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index e2ac48a77f1..82ee4a09cca 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -850,7 +850,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); |