sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shader/SpirV: Fix missing OpSelectionMerge before branching

This commit is contained in:
Jérôme Leclercq 2021-02-19 14:51:06 +01:00
parent 32569eef5e
commit 36be581d9a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/Shader/SpirvAstVisitor.cpp
View File

@ -452,6 +452,9 @@ namespace Nz
m_currentBlock = &previousContentBlock; m_currentBlock = &previousContentBlock;
Visit(firstCond.statement); Visit(firstCond.statement);
SpirvBlock mergeBlock(m_writer);
m_blocks.back().Append(SpirvOp::OpSelectionMerge, mergeBlock.GetLabelId(), SpirvSelectionControl::None);
std::optional<std::size_t> nextBlock; std::optional<std::size_t> nextBlock;
for (std::size_t statementIndex = 1; statementIndex < node.condStatements.size(); ++statementIndex) for (std::size_t statementIndex = 1; statementIndex < node.condStatements.size(); ++statementIndex)
{ {
@ -469,8 +472,6 @@ namespace Nz
Visit(statement.statement); Visit(statement.statement);
} }
SpirvBlock mergeBlock(m_writer);
if (node.elseStatement) if (node.elseStatement)
{ {
SpirvBlock elseBlock(m_writer); SpirvBlock elseBlock(m_writer);