fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

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

Fixes: 306800d747 ("pan/midgard: Lower gl_VertexID/gl_InstanceID to attributes")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10843>
(cherry picked from commit 958f11d537)
This commit is contained in:
Emma Anholt 2021-05-17 10:03:04 -07:00 • committed by Eric Engestrom
parent ce8b08b7e3
commit 154114bf81
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

4
src/panfrost/midgard/midgard_compile.c
View file

@ -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: