lavapipe: don't remove queue family barriers.

This fixes the remaining barrier issues.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23453>
This commit is contained in:
Dave Airlie 2023-06-06 10:59:38 +10:00 committed by Marge Bot
parent 91e919f1bf
commit bfed41d322

View file

@ -224,7 +224,8 @@ remove_scoped_barriers_impl(nir_builder *b, nir_instr *instr, void *data)
return false;
if (data) {
if (nir_intrinsic_memory_scope(intr) == NIR_SCOPE_WORKGROUP ||
nir_intrinsic_memory_scope(intr) == NIR_SCOPE_DEVICE)
nir_intrinsic_memory_scope(intr) == NIR_SCOPE_DEVICE ||
nir_intrinsic_memory_scope(intr) == NIR_SCOPE_QUEUE_FAMILY)
return false;
}
nir_instr_remove(instr);