Merge fix

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

View File

@@ -11,29 +11,23 @@
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Shader/Config.hpp>
#include <Nazara/Shader/Ast/AstCloner.hpp>
#include <Nazara/Shader/Ast/DependencyCheckerVisitor.hpp>
namespace Nz::ShaderAst
{
class NAZARA_SHADER_API EliminateUnusedPassVisitor : AstCloner
{
public:
struct Config;
EliminateUnusedPassVisitor() = default;
EliminateUnusedPassVisitor(const EliminateUnusedPassVisitor&) = delete;
EliminateUnusedPassVisitor(EliminateUnusedPassVisitor&&) = delete;
~EliminateUnusedPassVisitor() = default;
StatementPtr Process(Statement& statement, const Config& config = {});
StatementPtr Process(Statement& statement, const DependencyCheckerVisitor::UsageSet& usageSet);
EliminateUnusedPassVisitor& operator=(const EliminateUnusedPassVisitor&) = delete;
EliminateUnusedPassVisitor& operator=(EliminateUnusedPassVisitor&&) = delete;
struct Config
{
ShaderStageTypeFlags usedShaderStages = ShaderStageType_All;
};
private:
using AstCloner::Clone;
StatementPtr Clone(DeclareExternalStatement& node) override;
@@ -49,7 +43,8 @@ namespace Nz::ShaderAst
Context* m_context;
};
inline StatementPtr EliminateUnusedPass(Statement& ast, const EliminateUnusedPassVisitor::Config& config = {});
inline StatementPtr EliminateUnusedPass(Statement& ast, const DependencyCheckerVisitor::Config& config = {});
inline StatementPtr EliminateUnusedPass(Statement& ast, const DependencyCheckerVisitor::UsageSet& usageSet);
}
#include <Nazara/Shader/Ast/EliminateUnusedPassVisitor.inl>