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

Shader: Fix import of non-compiled module

This commit is contained in:
SirLynix 2022-04-19 19:15:49 +02:00
parent 36e5356c22
commit e5f552ef47
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/Nazara/Shader/Ast/IndexRemapperVisitor.cpp
View File

@ -46,10 +46,12 @@ namespace Nz::ShaderAst
{ {
DeclareConstStatementPtr clone = StaticUniquePointerCast<DeclareConstStatement>(AstCloner::Clone(node)); DeclareConstStatementPtr clone = StaticUniquePointerCast<DeclareConstStatement>(AstCloner::Clone(node));
assert(clone->constIndex); if (clone->constIndex)
std::size_t newConstIndex = m_context->callbacks->constIndexGenerator(*clone->constIndex); {
UniqueInsert(m_context->newConstIndices, *clone->constIndex, newConstIndex); std::size_t newConstIndex = m_context->callbacks->constIndexGenerator(*clone->constIndex);
clone->constIndex = newConstIndex; UniqueInsert(m_context->newConstIndices, *clone->constIndex, newConstIndex);
clone->constIndex = newConstIndex;
}
return clone; return clone;
} }
@ -60,10 +62,12 @@ namespace Nz::ShaderAst
for (auto& extVar : clone->externalVars) for (auto& extVar : clone->externalVars)
{ {
assert(extVar.varIndex); if (extVar.varIndex)
std::size_t newVarIndex = m_context->callbacks->varIndexGenerator(*extVar.varIndex); {
UniqueInsert(m_context->newVarIndices, *extVar.varIndex, newVarIndex); std::size_t newVarIndex = m_context->callbacks->varIndexGenerator(*extVar.varIndex);
extVar.varIndex = newVarIndex; UniqueInsert(m_context->newVarIndices, *extVar.varIndex, newVarIndex);
extVar.varIndex = newVarIndex;
}
} }
return clone; return clone;
@ -73,17 +77,19 @@ namespace Nz::ShaderAst
{ {
DeclareFunctionStatementPtr clone = StaticUniquePointerCast<DeclareFunctionStatement>(AstCloner::Clone(node)); DeclareFunctionStatementPtr clone = StaticUniquePointerCast<DeclareFunctionStatement>(AstCloner::Clone(node));
assert(clone->funcIndex); if (clone->funcIndex)
std::size_t newFuncIndex = m_context->callbacks->funcIndexGenerator(*clone->funcIndex); {
UniqueInsert(m_context->newFuncIndices, *clone->funcIndex, newFuncIndex); std::size_t newFuncIndex = m_context->callbacks->funcIndexGenerator(*clone->funcIndex);
clone->funcIndex = newFuncIndex; UniqueInsert(m_context->newFuncIndices, *clone->funcIndex, newFuncIndex);
clone->funcIndex = newFuncIndex;
}
if (!clone->parameters.empty()) if (!clone->parameters.empty())
{ {
for (auto& parameter : node.parameters) for (auto& parameter : node.parameters)
{ {
assert(parameter.varIndex); if (parameter.varIndex)
parameter.varIndex = Retrieve(m_context->newVarIndices, *parameter.varIndex); parameter.varIndex = Retrieve(m_context->newVarIndices, *parameter.varIndex);
HandleType(parameter.type); HandleType(parameter.type);
} }
@ -99,10 +105,12 @@ namespace Nz::ShaderAst
{ {
DeclareStructStatementPtr clone = StaticUniquePointerCast<DeclareStructStatement>(AstCloner::Clone(node)); DeclareStructStatementPtr clone = StaticUniquePointerCast<DeclareStructStatement>(AstCloner::Clone(node));
assert(clone->structIndex); if (clone->structIndex)
std::size_t newStructIndex = m_context->callbacks->structIndexGenerator(*clone->structIndex); {
UniqueInsert(m_context->newStructIndices, *clone->structIndex, newStructIndex); std::size_t newStructIndex = m_context->callbacks->structIndexGenerator(*clone->structIndex);
clone->structIndex = newStructIndex; UniqueInsert(m_context->newStructIndices, *clone->structIndex, newStructIndex);
clone->structIndex = newStructIndex;
}
for (auto& structMember : clone->description.members) for (auto& structMember : clone->description.members)
HandleType(structMember.type); HandleType(structMember.type);
@ -114,10 +122,12 @@ namespace Nz::ShaderAst
{ {
DeclareVariableStatementPtr clone = StaticUniquePointerCast<DeclareVariableStatement>(AstCloner::Clone(node)); DeclareVariableStatementPtr clone = StaticUniquePointerCast<DeclareVariableStatement>(AstCloner::Clone(node));
assert(clone->varIndex); if (clone->varIndex)
std::size_t newVarIndex = m_context->callbacks->varIndexGenerator(*clone->varIndex); {
UniqueInsert(m_context->newConstIndices, *clone->varIndex, newVarIndex); std::size_t newVarIndex = m_context->callbacks->varIndexGenerator(*clone->varIndex);
clone->varIndex = newVarIndex; UniqueInsert(m_context->newConstIndices, *clone->varIndex, newVarIndex);
clone->varIndex = newVarIndex;
}
HandleType(node.varType); HandleType(node.varType);
@ -128,8 +138,8 @@ namespace Nz::ShaderAst
{ {
FunctionExpressionPtr clone = StaticUniquePointerCast<FunctionExpression>(AstCloner::Clone(node)); FunctionExpressionPtr clone = StaticUniquePointerCast<FunctionExpression>(AstCloner::Clone(node));
assert(clone->funcId); if (clone->funcId)
clone->funcId = Retrieve(m_context->newFuncIndices, clone->funcId); clone->funcId = Retrieve(m_context->newFuncIndices, clone->funcId);
return clone; return clone;
} }
@ -138,8 +148,8 @@ namespace Nz::ShaderAst
{ {
StructTypeExpressionPtr clone = StaticUniquePointerCast<StructTypeExpression>(AstCloner::Clone(node)); StructTypeExpressionPtr clone = StaticUniquePointerCast<StructTypeExpression>(AstCloner::Clone(node));
assert(clone->structTypeId); if (clone->structTypeId)
clone->structTypeId = Retrieve(m_context->newStructIndices, clone->structTypeId); clone->structTypeId = Retrieve(m_context->newStructIndices, clone->structTypeId);
return clone; return clone;
} }
@ -148,14 +158,17 @@ namespace Nz::ShaderAst
{ {
VariableValueExpressionPtr clone = StaticUniquePointerCast<VariableValueExpression>(AstCloner::Clone(node)); VariableValueExpressionPtr clone = StaticUniquePointerCast<VariableValueExpression>(AstCloner::Clone(node));
assert(clone->variableId); if (clone->variableId)
clone->variableId = Retrieve(m_context->newVarIndices, clone->variableId); clone->variableId = Retrieve(m_context->newVarIndices, clone->variableId);
return clone; return clone;
} }
void IndexRemapperVisitor::HandleType(ExpressionValue<ExpressionType>& exprType) void IndexRemapperVisitor::HandleType(ExpressionValue<ExpressionType>& exprType)
{ {
if (!exprType.IsResultingValue())
return;
const auto& resultingType = exprType.GetResultingValue(); const auto& resultingType = exprType.GetResultingValue();
if (IsStructType(resultingType)) if (IsStructType(resultingType))
{ {