fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Emit if branches in the predecessor block

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-06-20 14:22:53 -05:00 • committed by Marge Bot
parent 0143f4566f
commit c1b62f1d15
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/nouveau/compiler/nak_from_nir.rs
View file

@ -1621,16 +1621,25 @@ impl<'a> ShaderFromNir<'a> {
}
}
let s0 = succ[0].unwrap();
if let Some(s1) = succ[1] {
/* Jump to the else. We'll come back and fix up the predicate as
* part of our handling of nir_if.
*/
b.push_op(OpBra { target: s1.index });
} else if s0.index == self.end_block_id {
b.push_op(OpExit {});
if let Some(ni) = nb.following_if() {
let mut bra = Instr::new_boxed(OpBra {
target: ni.first_else_block().index,
});
let cond = self.get_ssa(&ni.condition.as_def())[0];
bra.pred = cond.into();
/* This is the branch to jump to the else */
bra.pred.pred_inv = true;
b.push_instr(bra);
} else {
b.push_op(OpBra { target: s0.index });
assert!(succ[1].is_none());
let s0 = succ[0].unwrap();
if s0.index == self.end_block_id {
b.push_op(OpExit {});
} else {
b.push_op(OpBra { target: s0.index });
}
}
let mut bb = BasicBlock::new(nb.index);
@ -1639,13 +1648,6 @@ impl<'a> ShaderFromNir<'a> {
}
fn parse_if(&mut self, alloc: &mut SSAValueAllocator, ni: &nir_if) {
let cond = self.get_ssa(&ni.condition.as_def())[0];
let if_bra = self.blocks.last_mut().unwrap().branch_mut().unwrap();
if_bra.pred = cond.into();
/* This is the branch to jump to the else */
if_bra.pred.pred_inv = true;
self.parse_cf_list(alloc, ni.iter_then_list());
self.parse_cf_list(alloc, ni.iter_else_list());
}