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

Merge fix

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-02-27 18:54:45 +01:00
parent bcfef75ec2
commit 96d87d9439
6 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/Nazara/Shader/Ast/DependencyCheckerVisitor.hpp
View File

@@ -17,6 +17,7 @@ namespace Nz::ShaderAst
class NAZARA_SHADER_API DependencyCheckerVisitor : public AstRecursiveVisitor
{
public:
struct Config;
struct UsageSet;
DependencyCheckerVisitor() = default;
@@ -26,21 +27,18 @@ namespace Nz::ShaderAst
inline const UsageSet& GetUsage() const;
void Process(Statement& statement, const Config& config = {});
inline void Resolve();
using AstRecursiveVisitor::Visit;
void Visit(CallFunctionExpression& node) override;
void Visit(VariableExpression& node) override;
void Visit(DeclareExternalStatement& node) override;
void Visit(DeclareFunctionStatement& node) override;
void Visit(DeclareStructStatement& node) override;
void Visit(DeclareVariableStatement& node) override;
DependencyCheckerVisitor& operator=(const DependencyCheckerVisitor&) = delete;
DependencyCheckerVisitor& operator=(DependencyCheckerVisitor&&) = delete;
struct Config
{
ShaderStageTypeFlags usedShaderStages = ShaderStageType_All;
};
struct UsageSet
{
Bitset<> usedFunctions;
@@ -51,11 +49,22 @@ namespace Nz::ShaderAst
private:
void Resolve(const UsageSet& usageSet);
using AstRecursiveVisitor::Visit;
void Visit(CallFunctionExpression& node) override;
void Visit(VariableExpression& node) override;
void Visit(DeclareExternalStatement& node) override;
void Visit(DeclareFunctionStatement& node) override;
void Visit(DeclareStructStatement& node) override;
void Visit(DeclareVariableStatement& node) override;
std::optional<std::size_t> m_currentFunctionIndex;
std::optional<std::size_t> m_currentVariableDeclIndex;
std::unordered_map<std::size_t, UsageSet> m_functionUsages;
std::unordered_map<std::size_t, UsageSet> m_structUsages;
std::unordered_map<std::size_t, UsageSet> m_variableUsages;
Config m_config;
UsageSet m_globalUsage;
UsageSet m_resolvedUsage;
};