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

nir: Just return when asked to rewrite uses of an SSA def to itself.

Browse Source 
The nir_builder swizzling improvement to not emit extra MOVs resulted in
nir_lower_tex() trying to rewrite an SSA def to itself, triggering the
assert on all texturing in v3d.  There's no work to be done in this case,
so just stop asserting.

Fixes: 743700be1f ("nir/builder: Don't emit no-op swizzles")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Eric Anholt
2019-02-25 11:22:10 -08:00
parent 5671f38085
commit 7c1bf075f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/nir/nir.c
View File

@@ -1511,7 +1511,8 @@ void
nir_ssa_def_rewrite_uses_after(nir_ssa_def *def, nir_src new_src, nir_ssa_def_rewrite_uses_after(nir_ssa_def *def, nir_src new_src,
nir_instr *after_me) nir_instr *after_me)
{ {
assert(!new_src.is_ssa || def != new_src.ssa); if (new_src.is_ssa && def == new_src.ssa)
return;
nir_foreach_use_safe(use_src, def) { nir_foreach_use_safe(use_src, def) {
assert(use_src->parent_instr != def->parent_instr); assert(use_src->parent_instr != def->parent_instr);