Mesa (master): glsl_to_nir: fix vote_any/vote_all

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 34499de5b3793b6ad5302c4e2913803b9c48cc9f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34499de5b3793b6ad5302c4e2913803b9c48cc9f

Author: Rob Clark <robdclark at chromium.org>
Date:   Tue Jun 16 17:46:43 2020 -0700

glsl_to_nir: fix vote_any/vote_all

Signed-off-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5505>

---

 src/compiler/glsl/glsl_to_nir.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index d09377b24ef..69bcdeeff59 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -1534,11 +1534,12 @@ nir_visitor::visit(ir_call *ir)
          nir_builder_instr_insert(&b, &instr->instr);
          break;
       }
+      case nir_intrinsic_vote_ieq:
+         instr->num_components = 1;
+         /* fall-through */
       case nir_intrinsic_vote_any:
-      case nir_intrinsic_vote_all:
-      case nir_intrinsic_vote_ieq: {
+      case nir_intrinsic_vote_all: {
          nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 1, NULL);
-         instr->num_components = 1;
 
          ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head();
          instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value));