OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: fix rebase error from GS copy shader support

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: f8f7712666 ('aco: implement GS copy shaders')
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3601>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3601>
This commit is contained in:
Rhys Perry
2020-01-28 13:29:14 +00:00
committed by Marge Bot
parent dd9bf7d291
commit 7edcf4a59d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/compiler/aco_instruction_selection_setup.cpp
View File

@@ -884,6 +884,21 @@ setup_nir(isel_context *ctx, nir_shader *nir)
NIR_PASS(more_algebraic, nir, nir_opt_algebraic); NIR_PASS(more_algebraic, nir, nir_opt_algebraic);
} }
/* Do late algebraic optimization to turn add(a, neg(b)) back into
* subs, then the mandatory cleanup after algebraic. Note that it may
* produce fnegs, and if so then we need to keep running to squash
* fneg(fneg(a)).
*/
bool more_late_algebraic = true;
while (more_late_algebraic) {
more_late_algebraic = false;
NIR_PASS(more_late_algebraic, nir, nir_opt_algebraic_late);
NIR_PASS_V(nir, nir_opt_constant_folding);
NIR_PASS_V(nir, nir_copy_prop);
NIR_PASS_V(nir, nir_opt_dce);
NIR_PASS_V(nir, nir_opt_cse);
}
/* cleanup passes */ /* cleanup passes */
nir_lower_load_const_to_scalar(nir); nir_lower_load_const_to_scalar(nir);
nir_opt_shrink_load(nir); nir_opt_shrink_load(nir);