Mesa (staging/22.0): zink: emit spirv cap for subgroup vote ops

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 114e48ec5eb4840ff2589847ef74f1ca0a9e7d27
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=114e48ec5eb4840ff2589847ef74f1ca0a9e7d27

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 27 17:03:29 2022 -0400

zink: emit spirv cap for subgroup vote ops

cc: mesa-stable

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16757>
(cherry picked from commit aaf0d4490ea4e036e0c75cbe2494e2f4ffda398a)

---

 .pick_status.json                                    | 2 +-
 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 085215a7ebe..abad7ebb97e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -812,7 +812,7 @@
         "description": "zink: emit spirv cap for subgroup vote ops",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 0b1e179e468..f13d7dcbd31 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -2635,6 +2635,7 @@ emit_vote(struct ntv_context *ctx, nir_intrinsic_instr *intr)
    default:
       unreachable("unknown vote intrinsic");
    }
+   spirv_builder_emit_cap(&ctx->builder, SpvCapabilityGroupNonUniformVote);
    SpvId result = spirv_builder_emit_vote(&ctx->builder, op, get_src(ctx, &intr->src[0]));
    store_dest_raw(ctx, &intr->dest, result);
 }