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

Shader: Fix struct indexes in case of disabled field

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-07 21:36:40 +02:00
parent 72edff30c7
commit d679eccb43
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Nazara/Shader/Ast/SanitizeVisitor.cpp
View File

@@ -135,21 +135,28 @@ namespace Nz::ShaderAst
assert(structIndex < m_context->structs.size());
const StructDescription* s = m_context->structs[structIndex];
auto it = std::find_if(s->members.begin(), s->members.end(), [&](const auto& field)
// Retrieve member index (not counting disabled fields)
Int32 fieldIndex = 0;
const StructDescription::StructMember* fieldPtr = nullptr;
for (const auto& field : s->members)
{
if (field.name != identifier)
return false;
if (field.cond.HasValue() && !field.cond.GetResultingValue())
return false;
continue;
return true;
});
if (it == s->members.end())
if (field.name == identifier)
{
fieldPtr = &field;
break;
}
fieldIndex++;
}
if (!fieldPtr)
throw AstError{ "unknown field " + identifier };
accessIndexPtr->indices.push_back(ShaderBuilder::Constant(Int32(std::distance(s->members.begin(), it))));
accessIndexPtr->cachedExpressionType = ResolveType(it->type);
accessIndexPtr->indices.push_back(ShaderBuilder::Constant(fieldIndex));
accessIndexPtr->cachedExpressionType = ResolveType(fieldPtr->type);
}
else if (IsVectorType(exprType))
{