ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPIR-V: Handle conditional exece CF instructions

This commit is contained in:
Dr. Chat 2017-03-06 15:39:40 -06:00
parent 098d23c3d4
commit b661aa17f9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenia/gpu/spirv_shader_translator.cc
View File

@ -794,7 +794,6 @@ void SpirvShaderTranslator::ProcessExecInstructionBegin(
bool_type_, v, b.makeUintConstant(0)); bool_type_, v, b.makeUintConstant(0));
// Conditional branch // Conditional branch
assert_true(cf_blocks_.size() > instr.dword_index + 1);
body = &b.makeNewBlock(); body = &b.makeNewBlock();
exec_cond_ = true; exec_cond_ = true;
exec_skip_block_ = &b.makeNewBlock(); exec_skip_block_ = &b.makeNewBlock();
@ -805,11 +804,15 @@ void SpirvShaderTranslator::ProcessExecInstructionBegin(
b.createConditionalBranch(cond, body, exec_skip_block_); b.createConditionalBranch(cond, body, exec_skip_block_);
b.setBuildPoint(exec_skip_block_); b.setBuildPoint(exec_skip_block_);
b.createBranch(cf_blocks_[instr.dword_index + 1].block); if (!instr.is_end) {
assert_true(cf_blocks_.size() > instr.dword_index + 1);
b.createBranch(cf_blocks_[instr.dword_index + 1].block);
} else {
b.makeReturn(false);
}
} break; } break;
case ParsedExecInstruction::Type::kPredicated: { case ParsedExecInstruction::Type::kPredicated: {
// Branch based on p0. // Branch based on p0.
assert_true(cf_blocks_.size() > instr.dword_index + 1);
body = &b.makeNewBlock(); body = &b.makeNewBlock();
exec_cond_ = true; exec_cond_ = true;
exec_skip_block_ = &b.makeNewBlock(); exec_skip_block_ = &b.makeNewBlock();
@ -823,7 +826,12 @@ void SpirvShaderTranslator::ProcessExecInstructionBegin(
b.createConditionalBranch(cond, body, exec_skip_block_); b.createConditionalBranch(cond, body, exec_skip_block_);
b.setBuildPoint(exec_skip_block_); b.setBuildPoint(exec_skip_block_);
b.createBranch(cf_blocks_[instr.dword_index + 1].block); if (!instr.is_end) {
assert_true(cf_blocks_.size() > instr.dword_index + 1);
b.createBranch(cf_blocks_[instr.dword_index + 1].block);
} else {
b.makeReturn(false);
}
} break; } break;
} }
b.setBuildPoint(body); b.setBuildPoint(body);