diff --git a/.pick_status.json b/.pick_status.json index 61f1bac0685..41d27712bd8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "nir/move_discards_to_top: don't move across is_helper_invocation", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b447f5049b6d68fd80b7337bc1f7c79b1b1a4765", "notes": null diff --git a/src/compiler/nir/nir_opt_move_discards_to_top.c b/src/compiler/nir/nir_opt_move_discards_to_top.c index b36febbb4ba..e3d769f0c0f 100644 --- a/src/compiler/nir/nir_opt_move_discards_to_top.c +++ b/src/compiler/nir/nir_opt_move_discards_to_top.c @@ -187,6 +187,8 @@ opt_move_discards_to_top_impl(nir_function_impl *impl) case nir_intrinsic_shuffle_down: case nir_intrinsic_rotate: case nir_intrinsic_masked_swizzle_amd: + case nir_intrinsic_is_helper_invocation: + case nir_intrinsic_load_helper_invocation: instr->pass_flags = STOP_PROCESSING_INSTR_FLAG; goto break_all; case nir_intrinsic_terminate_if: