Mesa (staging/21.0): midgard: Fix type for vertex_builtin_arg() and compute_builtin_arg().

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 223bab7b52f713ffaa31e85c26ee79d91b6dc052
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=223bab7b52f713ffaa31e85c26ee79d91b6dc052

Author: Emma Anholt <emma at anholt.net>
Date:   Mon May 17 10:03:04 2021 -0700

midgard: Fix type for vertex_builtin_arg() and compute_builtin_arg().

It takes an intrinsic, not an ALU op.  Fixes a clang complaint about enum
conversion.

Fixes: 306800d747bc ("pan/midgard: Lower gl_VertexID/gl_InstanceID to attributes")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10843>
(cherry picked from commit 958f11d537334417af010b3d887a7dbacd0ca311)

---

 .pick_status.json                      | 2 +-
 src/panfrost/midgard/midgard_compile.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 707eb49eaae..428fbab9c5d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1336,7 +1336,7 @@
         "description": "midgard: Fix type for vertex_builtin_arg() and compute_builtin_arg().",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "306800d747bcf210baa84594cdbdca21e435ddd9"
     },
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 253cdedc53f..348ebadcab0 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1303,7 +1303,7 @@ emit_sysval_read(compiler_context *ctx, nir_instr *instr,
 }
 
 static unsigned
-compute_builtin_arg(nir_op op)
+compute_builtin_arg(nir_intrinsic_op op)
 {
         switch (op) {
         case nir_intrinsic_load_work_group_id:
@@ -1386,7 +1386,7 @@ emit_compute_builtin(compiler_context *ctx, nir_intrinsic_instr *instr)
 }
 
 static unsigned
-vertex_builtin_arg(nir_op op)
+vertex_builtin_arg(nir_intrinsic_op op)
 {
         switch (op) {
         case nir_intrinsic_load_vertex_id: