Module: Mesa Branch: main Commit: 0373b02cf6b6f396c7c3979d1c5dba4bb76571fb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0373b02cf6b6f396c7c3979d1c5dba4bb76571fb
Author: Jesse Natalie <[email protected]> Date: Fri May 12 08:14:46 2023 -0700 dxil: Don't run opt_remove_phis before lower_returns nir_lower_returns will run nir_opt_remove_phis as part of its work Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22913> --- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 6df633816f9..147ca0e6988 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -1025,9 +1025,6 @@ dxil_spirv_nir_passes(nir_shader *nir, NIR_PASS_V(nir, nir_lower_discard_or_demote, nir->info.use_legacy_math_rules); NIR_PASS_V(nir, dxil_nir_lower_discard_and_terminate); - /* Remove single-source phis now that returns have been inserted, otherwise - * lowering returns might not behave correctly. */ - NIR_PASS_V(nir, nir_opt_remove_phis); NIR_PASS_V(nir, nir_lower_returns); NIR_PASS_V(nir, dxil_nir_lower_sample_pos); NIR_PASS_V(nir, nir_lower_fragcoord_wtrans);
