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

Shader: Rename Optimize to ConstantPropagation

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-02-22 13:28:01 +01:00
parent 20a86312ff
commit 7ece44b4f4
11 changed files with 118 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/Nazara/Shader/Ast/AstOptimizer.hpp → include/Nazara/Shader/Ast/AstConstantPropagationVisitor.hpp
View File

@@ -4,8 +4,8 @@
#pragma once
#ifndef NAZARA_SHADER_AST_ASTOPTIMIZER_HPP
#define NAZARA_SHADER_AST_ASTOPTIMIZER_HPP
#ifndef NAZARA_SHADER_AST_ASTCONSTANTPROPAGATIONVISITOR_HPP
#define NAZARA_SHADER_AST_ASTCONSTANTPROPAGATIONVISITOR_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Shader/Config.hpp>
@@ -16,23 +16,23 @@
namespace Nz::ShaderAst
{
class NAZARA_SHADER_API AstOptimizer : public AstCloner
class NAZARA_SHADER_API AstConstantPropagationVisitor : public AstCloner
{
public:
struct Options;
AstOptimizer() = default;
AstOptimizer(const AstOptimizer&) = delete;
AstOptimizer(AstOptimizer&&) = delete;
~AstOptimizer() = default;
AstConstantPropagationVisitor() = default;
AstConstantPropagationVisitor(const AstConstantPropagationVisitor&) = delete;
AstConstantPropagationVisitor(AstConstantPropagationVisitor&&) = delete;
~AstConstantPropagationVisitor() = default;
inline ExpressionPtr Optimise(Expression& expression);
inline ExpressionPtr Optimise(Expression& expression, const Options& options);
inline StatementPtr Optimise(Statement& statement);
inline StatementPtr Optimise(Statement& statement, const Options& options);
inline ExpressionPtr Process(Expression& expression);
inline ExpressionPtr Process(Expression& expression, const Options& options);
inline StatementPtr Process(Statement& statement);
inline StatementPtr Process(Statement& statement, const Options& options);
AstOptimizer& operator=(const AstOptimizer&) = delete;
AstOptimizer& operator=(AstOptimizer&&) = delete;
AstConstantPropagationVisitor& operator=(const AstConstantPropagationVisitor&) = delete;
AstConstantPropagationVisitor& operator=(AstConstantPropagationVisitor&&) = delete;
struct Options
{
@@ -63,12 +63,12 @@ namespace Nz::ShaderAst
Options m_options;
};
inline ExpressionPtr Optimize(Expression& expr);
inline ExpressionPtr Optimize(Expression& expr, const AstOptimizer::Options& options);
inline StatementPtr Optimize(Statement& ast);
inline StatementPtr Optimize(Statement& ast, const AstOptimizer::Options& options);
inline ExpressionPtr PropagateConstants(Expression& expr);
inline ExpressionPtr PropagateConstants(Expression& expr, const AstConstantPropagationVisitor::Options& options);
inline StatementPtr PropagateConstants(Statement& ast);
inline StatementPtr PropagateConstants(Statement& ast, const AstConstantPropagationVisitor::Options& options);
}
#include <Nazara/Shader/Ast/AstOptimizer.inl>
#include <Nazara/Shader/Ast/AstConstantPropagationVisitor.inl>
#endif // NAZARA_SHADER_AST_ASTOPTIMIZER_HPP
#endif // NAZARA_SHADER_AST_ASTCONSTANTPROPAGATIONVISITOR_HPP

59
include/Nazara/Shader/Ast/AstConstantPropagationVisitor.inl Normal file
View File

@@ -0,0 +1,59 @@
// Copyright (C) 2022 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Shader module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Shader/Ast/AstConstantPropagationVisitor.hpp>
#include <Nazara/Shader/Debug.hpp>
namespace Nz::ShaderAst
{
inline ExpressionPtr AstConstantPropagationVisitor::Process(Expression& expression)
{
m_options = {};
return CloneExpression(expression);
}
inline ExpressionPtr AstConstantPropagationVisitor::Process(Expression& expression, const Options& options)
{
m_options = options;
return CloneExpression(expression);
}
inline StatementPtr AstConstantPropagationVisitor::Process(Statement& statement)
{
m_options = {};
return CloneStatement(statement);
}
inline StatementPtr AstConstantPropagationVisitor::Process(Statement& statement, const Options& options)
{
m_options = options;
return CloneStatement(statement);
}
inline ExpressionPtr PropagateConstants(Expression& ast)
{
AstConstantPropagationVisitor optimize;
return optimize.Process(ast);
}
inline ExpressionPtr PropagateConstants(Expression& ast, const AstConstantPropagationVisitor::Options& options)
{
AstConstantPropagationVisitor optimize;
return optimize.Process(ast, options);
}
inline StatementPtr PropagateConstants(Statement& ast)
{
AstConstantPropagationVisitor optimize;
return optimize.Process(ast);
}
inline StatementPtr PropagateConstants(Statement& ast, const AstConstantPropagationVisitor::Options& options)
{
AstConstantPropagationVisitor optimize;
return optimize.Process(ast, options);
}
}
#include <Nazara/Shader/DebugOff.hpp>

59
include/Nazara/Shader/Ast/AstOptimizer.inl
View File

@@ -1,59 +0,0 @@
// Copyright (C) 2022 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Shader module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Shader/Ast/AstOptimizer.hpp>
#include <Nazara/Shader/Debug.hpp>
namespace Nz::ShaderAst
{
inline ExpressionPtr AstOptimizer::Optimise(Expression& expression)
{
m_options = {};
return CloneExpression(expression);
}
inline ExpressionPtr AstOptimizer::Optimise(Expression& expression, const Options& options)
{
m_options = options;
return CloneExpression(expression);
}
inline StatementPtr AstOptimizer::Optimise(Statement& statement)
{
m_options = {};
return CloneStatement(statement);
}
inline StatementPtr AstOptimizer::Optimise(Statement& statement, const Options& options)
{
m_options = options;
return CloneStatement(statement);
}
inline ExpressionPtr Optimize(Expression& ast)
{
AstOptimizer optimize;
return optimize.Optimise(ast);
}
inline ExpressionPtr Optimize(Expression& ast, const AstOptimizer::Options& options)
{
AstOptimizer optimize;
return optimize.Optimise(ast, options);
}
inline StatementPtr Optimize(Statement& ast)
{
AstOptimizer optimize;
return optimize.Optimise(ast);
}
inline StatementPtr Optimize(Statement& ast, const AstOptimizer::Options& options)
{
AstOptimizer optimize;
return optimize.Optimise(ast, options);
}
}
#include <Nazara/Shader/DebugOff.hpp>

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

@@ -105,7 +105,7 @@ namespace Nz::ShaderAst
ConstantValue ComputeConstantValue(Expression& expr) const;
template<typename T> const T& ComputeExprValue(ExpressionValue<T>& attribute) const;
template<typename T> std::unique_ptr<T> Optimize(T& node) const;
template<typename T> std::unique_ptr<T> PropagateConstants(T& node) const;
void PropagateFunctionFlags(std::size_t funcIndex, FunctionFlags flags, Bitset<>& seen);