Mesa (staging/20.1): gallivm: add missing break

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 2 14:36:40 UTC 2020


Module: Mesa
Branch: staging/20.1
Commit: f51d41836996d3d595b3444e822fa1ec55c27e99
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f51d41836996d3d595b3444e822fa1ec55c27e99

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Jul  1 15:25:40 2020 +1000

gallivm: add missing break

Fixes: 26c5ae80f0b5 ("llvmpipe: enable ARB_shader_group_vote")

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5714>
(cherry picked from commit 06dc2f3f4759d5541fd52bf66ee43158c8405423)

---

 .pick_status.json                          | 2 +-
 src/gallium/auxiliary/gallivm/lp_bld_nir.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index af173e7022a..d9546858837 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -301,7 +301,7 @@
         "description": "gallivm: add missing break",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "26c5ae80f0b5c5f1c8779e4540a9aba88720c2cd"
     },
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
index 563f9e69e65..cf43c7032d6 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
@@ -1436,6 +1436,7 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base,
    case nir_intrinsic_global_atomic_exchange:
    case nir_intrinsic_global_atomic_comp_swap:
       visit_global_atomic(bld_base, instr, result);
+      break;
    case nir_intrinsic_vote_all:
    case nir_intrinsic_vote_any:
    case nir_intrinsic_vote_ieq:



More information about the mesa-commit mailing list