Merge branch 'master' into nzsl-modules

This commit is contained in:
Jérôme Leclercq
2022-02-27 18:44:44 +01:00
20 changed files with 133 additions and 75 deletions

View File

@@ -17,16 +17,23 @@ 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);
StatementPtr Process(Statement& statement, const Config& config = {});
EliminateUnusedPassVisitor& operator=(const EliminateUnusedPassVisitor&) = delete;
EliminateUnusedPassVisitor& operator=(EliminateUnusedPassVisitor&&) = delete;
struct Config
{
ShaderStageTypeFlags usedShaderStages = ShaderStageType_All;
};
private:
using AstCloner::Clone;
StatementPtr Clone(DeclareExternalStatement& node) override;
@@ -42,7 +49,7 @@ namespace Nz::ShaderAst
Context* m_context;
};
inline StatementPtr EliminateUnusedPass(Statement& ast);
inline StatementPtr EliminateUnusedPass(Statement& ast, const EliminateUnusedPassVisitor::Config& config = {});
}
#include <Nazara/Shader/Ast/EliminateUnusedPassVisitor.inl>

View File

@@ -7,10 +7,10 @@
namespace Nz::ShaderAst
{
inline StatementPtr EliminateUnusedPass(Statement& ast)
inline StatementPtr EliminateUnusedPass(Statement& ast, const EliminateUnusedPassVisitor::Config& config)
{
EliminateUnusedPassVisitor visitor;
return visitor.Process(ast);
return visitor.Process(ast, config);
}
}