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

Shader/SanitizeVisitor: Fix an issue when double-sanitizing

Browse Source 
... with differents parameters (like reducing loops to while, which introduces new variables which would take over existing var indices)
This commit is contained in:
Jérôme Leclercq
2022-03-10 12:44:47 +01:00
parent bf7f06ac4c
commit 98bd04e35a
5 changed files with 174 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/Nazara/Shader/Ast/AstReflect.hpp
View File

@@ -32,12 +32,33 @@ namespace Nz::ShaderAst
struct Callbacks
{
std::function<void(ShaderStageType stageType, const std::string& functionName)> onEntryPointDeclaration;
std::function<void(const std::string& optionName, const ExpressionValue<ExpressionType>& optionType)> onOptionDeclaration;
std::function<void(const DeclareAliasStatement& aliasDecl)> onAliasDeclaration;
std::function<void(const DeclareConstStatement& constDecl)> onConstDeclaration;
std::function<void(const DeclareExternalStatement& extDecl)> onExternalDeclaration;
std::function<void(const DeclareFunctionStatement& funcDecl)> onFunctionDeclaration;
std::function<void(const DeclareOptionStatement& optionDecl)> onOptionDeclaration;
std::function<void(const DeclareStructStatement& structDecl)> onStructDeclaration;
std::function<void(const DeclareVariableStatement& variableDecl)> onVariableDeclaration;
std::function<void(const std::string& name, std::size_t aliasIndex)> onAliasIndex;
std::function<void(const std::string& name, std::size_t constIndex)> onConstIndex;
std::function<void(const std::string& name, std::size_t funcIndex)> onFunctionIndex;
std::function<void(const std::string& name, std::size_t optIndex)> onOptionIndex;
std::function<void(const std::string& name, std::size_t structIndex)> onStructIndex;
std::function<void(const std::string& name, std::size_t varIndex)> onVariableIndex;
};
private:
void Visit(DeclareAliasStatement& node) override;
void Visit(DeclareConstStatement& node) override;
void Visit(DeclareExternalStatement& node) override;
void Visit(DeclareFunctionStatement& node) override;
void Visit(DeclareOptionStatement& node) override;
void Visit(DeclareStructStatement& node) override;
void Visit(DeclareVariableStatement& node) override;
void Visit(ForStatement& node) override;
void Visit(ForEachStatement& node) override;
const Callbacks* m_callbacks;
};

1
include/Nazara/Shader/Ast/SanitizeVisitor.hpp
View File

@@ -124,6 +124,7 @@ namespace Nz::ShaderAst
template<typename T> const T& ComputeExprValue(ExpressionValue<T>& attribute) const;
template<typename T> std::unique_ptr<T> PropagateConstants(T& node) const;
void PreregisterIndices(const Module& module);
void PropagateFunctionFlags(std::size_t funcIndex, FunctionFlags flags, Bitset<>& seen);
void RegisterBuiltin();