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

Fix compilation with Clang

This commit is contained in:
Jérôme Leclercq 2021-08-21 15:27:32 +02:00
parent db99196d3a
commit b31c56c642
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Nazara/Shader/SpirvWriter.cpp
View File

@ -73,10 +73,8 @@ namespace Nz
using FunctionContainer = std::vector<std::reference_wrapper<ShaderAst::DeclareFunctionStatement>>; using FunctionContainer = std::vector<std::reference_wrapper<ShaderAst::DeclareFunctionStatement>>;
using StructContainer = std::vector<ShaderAst::StructDescription*>; using StructContainer = std::vector<ShaderAst::StructDescription*>;
PreVisitor(const SpirvWriter::States& conditions, SpirvConstantCache& constantCache, std::unordered_map<std::size_t, SpirvAstVisitor::FuncData>& funcs) : PreVisitor(SpirvConstantCache& constantCache, std::unordered_map<std::size_t, SpirvAstVisitor::FuncData>& funcs) :
m_states(conditions),
m_constantCache(constantCache), m_constantCache(constantCache),
m_externalBlockIndex(0),
m_funcs(funcs) m_funcs(funcs)
{ {
m_constantCache.SetStructCallback([this](std::size_t structIndex) -> const ShaderAst::StructDescription& m_constantCache.SetStructCallback([this](std::size_t structIndex) -> const ShaderAst::StructDescription&
@ -416,10 +414,8 @@ namespace Nz
StructContainer declaredStructs; StructContainer declaredStructs;
private: private:
const SpirvWriter::States& m_states;
SpirvConstantCache& m_constantCache; SpirvConstantCache& m_constantCache;
std::optional<std::size_t> m_funcIndex; std::optional<std::size_t> m_funcIndex;
std::size_t m_externalBlockIndex;
std::unordered_map<std::size_t, SpirvAstVisitor::FuncData>& m_funcs; std::unordered_map<std::size_t, SpirvAstVisitor::FuncData>& m_funcs;
}; };
} }
@ -490,7 +486,7 @@ namespace Nz
}); });
// Register all extended instruction sets // Register all extended instruction sets
PreVisitor preVisitor(states, state.constantTypeCache, state.funcs); PreVisitor preVisitor(state.constantTypeCache, state.funcs);
targetAst->Visit(preVisitor); targetAst->Visit(preVisitor);
m_currentState->preVisitor = &preVisitor; m_currentState->preVisitor = &preVisitor;
@ -583,11 +579,12 @@ namespace Nz
throw std::runtime_error("not yet implemented"); throw std::runtime_error("not yet implemented");
} }
auto& funcData = func;
m_currentState->header.AppendVariadic(SpirvOp::OpEntryPoint, [&](const auto& appender) m_currentState->header.AppendVariadic(SpirvOp::OpEntryPoint, [&](const auto& appender)
{ {
appender(execModel); appender(execModel);
appender(func.funcId); appender(funcData.funcId);
appender(func.name); appender(funcData.name);
for (const auto& input : entryPointData.inputs) for (const auto& input : entryPointData.inputs)
appender(input.varId); appender(input.varId);