Mesa (staging/20.1): nir: add missing break to nir_opt_access()

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


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Jul  1 18:56:09 2020 +1000

nir: add missing break to nir_opt_access()

Fixes: f2d0e48ddc74 ("glsl/nir: Add optimization pass for access flags")

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5714>
(cherry picked from commit d55aa78615f0b80a5e35f28b32201189c86345b7)

---

 .pick_status.json                 | 2 +-
 src/compiler/nir/nir_opt_access.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index d9546858837..6757a0420c2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "nir: add missing break to nir_opt_access()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f2d0e48ddc74d01be1d3e259c5687ff37e4c8d69"
     },
diff --git a/src/compiler/nir/nir_opt_access.c b/src/compiler/nir/nir_opt_access.c
index e2a6b8f2747..e1ff9b665e4 100644
--- a/src/compiler/nir/nir_opt_access.c
+++ b/src/compiler/nir/nir_opt_access.c
@@ -120,6 +120,7 @@ gather_intrinsic(struct access_state *state, nir_intrinsic_instr *instr)
 
       _mesa_set_add(state->vars_written, var);
       state->buffers_written = true;
+      break;
 
    case nir_intrinsic_memory_barrier:
       state->buffer_barriers = true;



More information about the mesa-commit mailing list