backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxbc] Fix case labels when case blocks are terminated with ret

Browse Source 
Fixes incorrect shader in Monster Hunter World, which caused
RADV to crash.
This commit is contained in:
Philip Rebohle 2018-08-10 03:31:35 +02:00
parent 82c891b1fb
commit e1479f41c1
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dxbc/dxbc_compiler.cpp
View File

@ -3519,7 +3519,7 @@ namespace dxvk {
DxbcSwitchLabel label; DxbcSwitchLabel label;
label.desc.literal = ins.src[0].imm.u32_1; label.desc.literal = ins.src[0].imm.u32_1;
label.desc.labelId = block->labelCase; label.desc.labelId = block->labelCase;
label.next = block->labelCases; label.next = block->labelCases;
block->labelCases = new DxbcSwitchLabel(label); block->labelCases = new DxbcSwitchLabel(label);
} }
@ -3698,15 +3698,21 @@ namespace dxvk {
void DxbcCompiler::emitControlFlowRet(const DxbcShaderInstruction& ins) { void DxbcCompiler::emitControlFlowRet(const DxbcShaderInstruction& ins) {
m_module.opReturn(); m_module.opReturn();
if (m_controlFlowBlocks.size() == 0) if (m_controlFlowBlocks.size() != 0) {
uint32_t labelId = m_module.allocateId();
m_module.opLabel(labelId);
// return can be used in place of break to terminate a case block
if (m_controlFlowBlocks.back().type == DxbcCfgBlockType::Switch)
m_controlFlowBlocks.back().b_switch.labelCase = labelId;
} else {
// Last instruction in the current function
m_module.functionEnd(); m_module.functionEnd();
else }
m_module.opLabel(m_module.allocateId());
} }
void DxbcCompiler::emitControlFlowRetc(const DxbcShaderInstruction& ins) { void DxbcCompiler::emitControlFlowRetc(const DxbcShaderInstruction& ins) {
// Perform zero test on the first component of the condition // Perform zero test on the first component of the condition
const DxbcRegisterValue condition = emitRegisterLoad( const DxbcRegisterValue condition = emitRegisterLoad(
ins.src[0], DxbcRegMask(true, false, false, false)); ins.src[0], DxbcRegMask(true, false, false, false));