rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-20 10:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Handle fallthrough around default properly

Browse Source
This commit is contained in:
Philip Rebohle 2022-03-23 15:11:54 +01:00
parent 8823e4bb3d
commit e440fa26ab
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dxbc/dxbc_compiler.cpp
View File

@ -3926,12 +3926,12 @@ namespace dxvk {
// Remove the block from the stack, it's closed
DxbcCfgBlock block = m_controlFlowBlocks.back();
m_controlFlowBlocks.pop_back();
// If no 'default' label was specified, use the last allocated
// 'case' label. This is guaranteed to be an empty block unless
// a previous 'case' block was not closed properly.
if (block.b_switch.labelDefault == 0)
block.b_switch.labelDefault = block.b_switch.labelCase;
if (!block.b_switch.labelDefault) {
block.b_switch.labelDefault = caseBlockIsFallthrough()
? block.b_switch.labelBreak
: block.b_switch.labelCase;
}
// Close the current 'case' block
m_module.opBranch(block.b_switch.labelBreak);
@ -7820,6 +7820,7 @@ namespace dxvk {
bool DxbcCompiler::caseBlockIsFallthrough() const {
return m_lastOp != DxbcOpcode::Case
&& m_lastOp != DxbcOpcode::Default
&& m_lastOp != DxbcOpcode::Break
&& m_lastOp != DxbcOpcode::Ret;
}