From bfed41d3229e0308f3882fc456439562b4664bbe Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 Jun 2023 10:59:38 +1000
Subject: [PATCH] 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>
---
 src/gallium/frontends/lavapipe/lvp_pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index 0f357cd3709..99b8161efc3 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -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);