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

Shader/SanitizeVisitor: Fix variable shadowing

This commit is contained in:
Jérôme Leclercq 2022-02-27 18:43:38 +01:00
parent 0fe7f6b899
commit 6ee3899400
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2271,7 +2271,21 @@ namespace Nz::ShaderAst
TypeMustMatch(resolvedType, GetExpressionType(*node.initialExpression));
}
if (m_context->options.makeVariableNameUnique && FindIdentifier(node.varName) != nullptr)
node.varIndex = RegisterVariable(node.varName, resolvedType);
node.varType = std::move(resolvedType);
if (m_context->options.makeVariableNameUnique)
{
// Since we are registered, FindIdentifier will find us
auto IgnoreOurself = [varIndex = *node.varIndex](const Identifier& identifier)
{
if (identifier.type == Identifier::Type::Variable && identifier.index == varIndex)
return false;
return true;
};
if (FindIdentifier(node.varName, IgnoreOurself) != nullptr)
{
// Try to make variable name unique by appending _X to its name (incrementing X until it's unique) to the variable name until by incrementing X
unsigned int cloneIndex = 2;
@ -2280,13 +2294,11 @@ namespace Nz::ShaderAst
{
candidateName = node.varName + "_" + std::to_string(cloneIndex++);
}
while (FindIdentifier(candidateName) != nullptr);
while (FindIdentifier(candidateName, IgnoreOurself) != nullptr);
node.varName = std::move(candidateName);
}
node.varIndex = RegisterVariable(node.varName, resolvedType);
node.varType = std::move(resolvedType);
}
SanitizeIdentifier(node.varName);
}