github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

spv-in: more loop fixes

Browse Source
This commit is contained in:
Matúš Talčík
2020-10-31 14:42:46 +01:00
committed by Dzmitry Malyshau
parent 0893d912be
commit 173bb0de42
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/front/spv/flow.rs
View File

@@ -250,7 +250,7 @@ impl FlowGraph {
accept: self.naga_traverse(true_node_index, Some(merge_node_index))?,
reject: self.naga_traverse(false_node_index, Some(merge_node_index))?,
});
result.extend(self.naga_traverse(merge_node_index, None)?);
result.extend(self.naga_traverse(merge_node_index, stop_node_index)?);
} else {
result.push(crate::Statement::If {
condition,
@@ -258,7 +258,7 @@ impl FlowGraph {
self.block_to_node[&true_id],
Some(merge_node_index),
)?,
reject: self.naga_traverse(merge_node_index, None)?,
reject: self.naga_traverse(merge_node_index, stop_node_index)?,
});
}
@@ -309,7 +309,7 @@ impl FlowGraph {
.naga_traverse(self.block_to_node[&default], Some(merge_node_index))?,
});
result.extend(self.naga_traverse(merge_node_index, None)?);
result.extend(self.naga_traverse(merge_node_index, stop_node_index)?);
Ok(result)
}
@@ -347,7 +347,7 @@ impl FlowGraph {
};
let mut result = vec![crate::Statement::Loop { body, continuing }];
result.extend(self.naga_traverse(merge_node_index, None)?);
result.extend(self.naga_traverse(merge_node_index, stop_node_index)?);
Ok(result)
}
@@ -391,13 +391,19 @@ impl FlowGraph {
Ok(result)
}
Some(ControlFlowNodeType::Continue) => {
let back_block = match node.terminator {
Terminator::Branch { target_id } => {
self.naga_traverse(self.block_to_node[&target_id], None)?
}
_ => return Err(Error::InvalidTerminator),
};
let mut result = node.block.clone();
result.extend(back_block);
result.push(crate::Statement::Continue);
Ok(result)
}
Some(ControlFlowNodeType::Back) | Some(ControlFlowNodeType::Merge) => {
Ok(node.block.clone())
}
Some(ControlFlowNodeType::Back) => Ok(node.block.clone()),
Some(ControlFlowNodeType::Kill) => {
let mut result = node.block.clone();
result.push(crate::Statement::Kill);
@@ -412,7 +418,7 @@ impl FlowGraph {
result.push(crate::Statement::Return { value });
Ok(result)
}
None => match node.terminator {
Some(ControlFlowNodeType::Merge) | None => match node.terminator {
Terminator::Branch { target_id } => {
let mut result = node.block.clone();
result.extend(