From 154114bf8159540cea4ae6ccc9056096f867d44b Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 17 May 2021 10:03:04 -0700 Subject: [PATCH] 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: (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 66e031b3e5d..f64a0cfae9d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -85,7 +85,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 e00967d503e..58c9aea3f0d 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1489,7 +1489,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: @@ -1572,7 +1572,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: