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

Shader: Improve variable name sanitization

This commit is contained in:
Jérôme Leclercq 2021-07-06 11:59:39 +02:00
parent ae73f68d8c
commit 749b40cb31
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,13 +901,14 @@ namespace Nz::ShaderAst
if (m_context->options.makeVariableNameUnique && FindIdentifier(clone->varName) != nullptr) if (m_context->options.makeVariableNameUnique && FindIdentifier(clone->varName) != nullptr)
{ {
// Try to append _X to the variable name until by incrementing X
unsigned int cloneIndex = 2; unsigned int cloneIndex = 2;
std::string candidateName = clone->varName + "_" + std::to_string(cloneIndex); std::string candidateName;
while (FindIdentifier(clone->varName + "_" + std::to_string(cloneIndex)) != nullptr) do
{ {
cloneIndex++; candidateName = clone->varName + "_" + std::to_string(cloneIndex++);
candidateName = clone->varName + "_" + std::to_string(cloneIndex);
} }
while (FindIdentifier(candidateName) != nullptr);
clone->varName = std::move(candidateName); clone->varName = std::move(candidateName);
} }