diff --git a/.pick_status.json b/.pick_status.json index 5e987fd1de5..41029d1b5f2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -144,7 +144,7 @@ "description": "ir3: don't predicate vote_all/vote_any", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "39088571f08ae0b8dee1cf51bf590df5c23962bf", "notes": null diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index 019a3bb1c7a..8e3968dec83 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -4511,6 +4511,8 @@ instr_can_be_predicated(nir_instr *instr) case nir_intrinsic_demote_if: case nir_intrinsic_terminate: case nir_intrinsic_terminate_if: + case nir_intrinsic_vote_all: + case nir_intrinsic_vote_any: return false; default: return true;