Module: Mesa Branch: main Commit: 958f11d537334417af010b3d887a7dbacd0ca311 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=958f11d537334417af010b3d887a7dbacd0ca311
Author: Emma Anholt <[email protected]> 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> --- src/panfrost/midgard/midgard_compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index a4e17ce130b..9d259592e25 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1521,7 +1521,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: @@ -1604,7 +1604,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: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
