franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk_shader_compiler: Correct SPIR-V AST Decompiling

This commit is contained in:
Fernando Sahmkow 2019-09-21 00:45:13 -04:00 committed by FernandoS27
parent 2e9a810423
commit 466cd52ad4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
View File

@ -1714,6 +1714,7 @@ public:
Visit(current); Visit(current);
current = current->GetNext(); current = current->GetNext();
} }
decomp.Emit(decomp.OpBranch(endif_label));
decomp.Emit(endif_label); decomp.Emit(endif_label);
} }
@ -1749,6 +1750,7 @@ public:
const Id loop_start_block = decomp.OpLabel(); const Id loop_start_block = decomp.OpLabel();
const Id loop_end_block = decomp.OpLabel(); const Id loop_end_block = decomp.OpLabel();
current_loop_exit = endloop_label; current_loop_exit = endloop_label;
decomp.Emit(decomp.OpBranch(loop_label));
decomp.Emit(loop_label); decomp.Emit(loop_label);
decomp.Emit( decomp.Emit(
decomp.OpLoopMerge(endloop_label, loop_end_block, spv::LoopControlMask::MaskNone)); decomp.OpLoopMerge(endloop_label, loop_end_block, spv::LoopControlMask::MaskNone));
@ -1759,8 +1761,6 @@ public:
Visit(current); Visit(current);
current = current->GetNext(); current = current->GetNext();
} }
decomp.Emit(decomp.OpBranch(loop_end_block));
decomp.Emit(loop_end_block);
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
const Id condition = expr_parser.Visit(ast.condition); const Id condition = expr_parser.Visit(ast.condition);
decomp.Emit(decomp.OpBranchConditional(condition, loop_label, endloop_label)); decomp.Emit(decomp.OpBranchConditional(condition, loop_label, endloop_label));
@ -1785,7 +1785,9 @@ public:
} }
decomp.Emit(endif_label); decomp.Emit(endif_label);
} else { } else {
decomp.Emit(decomp.OpLabel()); const Id next_block = decomp.OpLabel();
decomp.Emit(decomp.OpBranch(next_block));
decomp.Emit(next_block);
if (ast.kills) { if (ast.kills) {
decomp.Emit(decomp.OpKill()); decomp.Emit(decomp.OpKill());
} else { } else {
@ -1809,7 +1811,9 @@ public:
decomp.Emit(decomp.OpBranch(current_loop_exit)); decomp.Emit(decomp.OpBranch(current_loop_exit));
decomp.Emit(endif_label); decomp.Emit(endif_label);
} else { } else {
decomp.Emit(decomp.OpLabel()); const Id next_block = decomp.OpLabel();
decomp.Emit(decomp.OpBranch(next_block));
decomp.Emit(next_block);
decomp.Emit(decomp.OpBranch(current_loop_exit)); decomp.Emit(decomp.OpBranch(current_loop_exit));
decomp.Emit(decomp.OpLabel()); decomp.Emit(decomp.OpLabel());
} }
@ -1834,6 +1838,9 @@ void SPIRVDecompiler::DecompileAST() {
ASTDecompiler decompiler{*this}; ASTDecompiler decompiler{*this};
VideoCommon::Shader::ASTNode program = ir.GetASTProgram(); VideoCommon::Shader::ASTNode program = ir.GetASTProgram();
decompiler.Visit(program); decompiler.Visit(program);
const Id next_block = OpLabel();
Emit(OpBranch(next_block));
Emit(next_block);
} }
DecompilerResult Decompile(const VKDevice& device, const VideoCommon::Shader::ShaderIR& ir, DecompilerResult Decompile(const VKDevice& device, const VideoCommon::Shader::ShaderIR& ir,