Merge fix

src/Nazara/Shader/Ast/DependencyCheckerVisitor.cpp

@@ -24,6 +24,12 @@ namespace Nz::ShaderAst
 		}
 	}
 
+	void DependencyCheckerVisitor::Process(Statement& statement, const Config& config)
+	{
+		m_config = config;
+		statement.Visit(*this);
+	}
+
 	void DependencyCheckerVisitor::Visit(CallFunctionExpression& node)
 	{
 		const auto& targetFuncType = GetExpressionType(node);
@@ -32,8 +38,18 @@ namespace Nz::ShaderAst
 		const auto& funcType = std::get<FunctionType>(targetFuncType);
 
 		assert(m_currentFunctionIndex);
-		UsageSet& usageSet = Retrieve(m_functionUsages, *m_currentFunctionIndex);
-		usageSet.usedFunctions.UnboundedSet(funcType.funcIndex);
+		if (m_currentVariableDeclIndex)
+		{
+			UsageSet& usageSet = Retrieve(m_variableUsages, *m_currentVariableDeclIndex);
+			usageSet.usedFunctions.UnboundedSet(funcType.funcIndex);
+		}
+		else
+		{
+			UsageSet& usageSet = Retrieve(m_functionUsages, *m_currentFunctionIndex);
+			usageSet.usedFunctions.UnboundedSet(funcType.funcIndex);
+		}
+
+		AstRecursiveVisitor::Visit(node);
 	}
 
 	void DependencyCheckerVisitor::Visit(DeclareExternalStatement& node)
@@ -99,7 +115,11 @@ namespace Nz::ShaderAst
 		}
 
 		if (node.entryStage.HasValue())
-			m_globalUsage.usedFunctions.UnboundedSet(*node.funcIndex);
+		{
+			ShaderStageType shaderStage = node.entryStage.GetResultingValue();
+			if (m_config.usedShaderStages & shaderStage)
+				m_globalUsage.usedFunctions.UnboundedSet(*node.funcIndex);
+		}
 
 		m_currentFunctionIndex = node.funcIndex;
 		AstRecursiveVisitor::Visit(node);

src/Nazara/Shader/Ast/EliminateUnusedPassVisitor.cpp

@@ -6,7 +6,6 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
 #include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
-#include <Nazara/Shader/Ast/DependencyCheckerVisitor.hpp>
 #include <unordered_map>
 #include <Nazara/Shader/Debug.hpp>
 
@@ -14,14 +13,14 @@ namespace Nz::ShaderAst
 {
 	struct EliminateUnusedPassVisitor::Context
 	{
-		DependencyCheckerVisitor usageChecker;
+		const DependencyCheckerVisitor::UsageSet& usageSet;
 	};
 
-	StatementPtr EliminateUnusedPassVisitor::Process(Statement& statement, const Config& config)
+	StatementPtr EliminateUnusedPassVisitor::Process(Statement& statement, const DependencyCheckerVisitor::UsageSet& usageSet)
 	{
-		Context context(config);
-		statement.Visit(context.usageChecker);
-		context.usageChecker.Resolve();
+		Context context{
+			usageSet
+		};
 
 		m_context = &context;
 		CallOnExit onExit([this]()
@@ -98,18 +97,18 @@ namespace Nz::ShaderAst
 	bool EliminateUnusedPassVisitor::IsFunctionUsed(std::size_t varIndex) const
 	{
 		assert(m_context);
-		return m_context->usageChecker.GetUsage().usedFunctions.UnboundedTest(varIndex);
+		return m_context->usageSet.usedFunctions.UnboundedTest(varIndex);
 	}
 
 	bool EliminateUnusedPassVisitor::IsStructUsed(std::size_t varIndex) const
 	{
 		assert(m_context);
-		return m_context->usageChecker.GetUsage().usedStructs.UnboundedTest(varIndex);
+		return m_context->usageSet.usedStructs.UnboundedTest(varIndex);
 	}
 
 	bool EliminateUnusedPassVisitor::IsVariableUsed(std::size_t varIndex) const
 	{
 		assert(m_context);
-		return m_context->usageChecker.GetUsage().usedVariables.UnboundedTest(varIndex);
+		return m_context->usageSet.usedVariables.UnboundedTest(varIndex);
 	}
 }

src/Nazara/Shader/GlslWriter.cpp

@@ -180,12 +180,12 @@ namespace Nz
 		{
 			ShaderAst::StatementPtr tempAst;
 
-			ShaderAst::EliminateUnusedPassVisitor::Config eliminateUnunsedConfig;
+			ShaderAst::DependencyCheckerVisitor::Config dependencyConfig;
 			if (shaderStage)
-				eliminateUnunsedConfig.usedShaderStages = *shaderStage;
+				dependencyConfig.usedShaderStages = *shaderStage;
 
 			tempAst = ShaderAst::PropagateConstants(*targetAst);
-			optimizedAst = ShaderAst::EliminateUnusedPass(*tempAst, eliminateUnunsedConfig);
+			optimizedAst = ShaderAst::EliminateUnusedPass(*tempAst, dependencyConfig);
 
 			targetAst = optimizedAst.get();
 		}