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

Shader: Rename VariableExpression to VariableValueExpression

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-09 12:30:34 +01:00
parent 1401c46d44
commit d45ba6696f
30 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ namespace Nz::ShaderAst
virtual ExpressionPtr Clone(IntrinsicFunctionExpression& node);
virtual ExpressionPtr Clone(StructTypeExpression& node);
virtual ExpressionPtr Clone(SwizzleExpression& node);
virtual ExpressionPtr Clone(VariableExpression& node);
virtual ExpressionPtr Clone(VariableValueExpression& node);
virtual ExpressionPtr Clone(UnaryExpression& node);
virtual StatementPtr Clone(BranchStatement& node);

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

@@ -48,7 +48,7 @@ namespace Nz::ShaderAst
inline bool Compare(const IntrinsicFunctionExpression& lhs, const IntrinsicFunctionExpression& rhs);
inline bool Compare(const StructTypeExpression& lhs, const StructTypeExpression& rhs);
inline bool Compare(const SwizzleExpression& lhs, const SwizzleExpression& rhs);
inline bool Compare(const VariableExpression& lhs, const VariableExpression& rhs);
inline bool Compare(const VariableValueExpression& lhs, const VariableValueExpression& rhs);
inline bool Compare(const UnaryExpression& lhs, const UnaryExpression& rhs);
inline bool Compare(const BranchStatement& lhs, const BranchStatement& rhs);

2
include/Nazara/Shader/Ast/AstCompare.inl
View File

@@ -399,7 +399,7 @@ namespace Nz::ShaderAst
return true;
}
inline bool Compare(const VariableExpression& lhs, const VariableExpression& rhs)
inline bool Compare(const VariableValueExpression& lhs, const VariableValueExpression& rhs)
{
if (!Compare(lhs.variableId, rhs.variableId))
return false;

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

@@ -44,7 +44,7 @@ NAZARA_SHADERAST_EXPRESSION(IntrinsicExpression)
NAZARA_SHADERAST_EXPRESSION(IntrinsicFunctionExpression)
NAZARA_SHADERAST_EXPRESSION(StructTypeExpression)
NAZARA_SHADERAST_EXPRESSION(SwizzleExpression)
NAZARA_SHADERAST_EXPRESSION(VariableExpression)
NAZARA_SHADERAST_EXPRESSION(VariableValueExpression)
NAZARA_SHADERAST_EXPRESSION(UnaryExpression)
NAZARA_SHADERAST_STATEMENT(BranchStatement)
NAZARA_SHADERAST_STATEMENT(ConditionalStatement)

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

@@ -36,7 +36,7 @@ namespace Nz::ShaderAst
void Visit(IntrinsicFunctionExpression& node) override;
void Visit(StructTypeExpression& node) override;
void Visit(SwizzleExpression& node) override;
void Visit(VariableExpression& node) override;
void Visit(VariableValueExpression& node) override;
void Visit(UnaryExpression& node) override;
void Visit(BranchStatement& node) override;

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

@@ -39,7 +39,7 @@ namespace Nz::ShaderAst
void Serialize(IntrinsicFunctionExpression& node);
void Serialize(StructTypeExpression& node);
void Serialize(SwizzleExpression& node);
void Serialize(VariableExpression& node);
void Serialize(VariableValueExpression& node);
void Serialize(UnaryExpression& node);
void Serialize(BranchStatement& node);

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

@@ -47,7 +47,7 @@ namespace Nz::ShaderAst
void Visit(IntrinsicFunctionExpression& node) override;
void Visit(StructTypeExpression& node) override;
void Visit(SwizzleExpression& node) override;
void Visit(VariableExpression& node) override;
void Visit(VariableValueExpression& node) override;
void Visit(UnaryExpression& node) override;
ExpressionCategory m_expressionCategory;

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

@@ -55,7 +55,7 @@ namespace Nz::ShaderAst
using AstRecursiveVisitor::Visit;
void Visit(CallFunctionExpression& node) override;
void Visit(VariableExpression& node) override;
void Visit(VariableValueExpression& node) override;
void Visit(DeclareExternalStatement& node) override;
void Visit(DeclareFunctionStatement& node) override;

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

@@ -47,7 +47,7 @@ namespace Nz::ShaderAst
ExpressionPtr Clone(FunctionExpression& node) override;
ExpressionPtr Clone(StructTypeExpression& node) override;
ExpressionPtr Clone(VariableExpression& node) override;
ExpressionPtr Clone(VariableValueExpression& node) override;
void HandleType(ExpressionValue<ExpressionType>& exprType);

1
include/Nazara/Shader/Ast/Nodes.hpp
View File

@@ -208,6 +208,7 @@ namespace Nz::ShaderAst
};
struct NAZARA_SHADER_API VariableExpression : Expression
struct NAZARA_SHADER_API VariableValueExpression : Expression
{
NodeType GetType() const override;
void Visit(AstExpressionVisitor& visitor) override;

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

@@ -82,7 +82,7 @@ namespace Nz::ShaderAst
ExpressionPtr Clone(IntrinsicExpression& node) override;
ExpressionPtr Clone(SwizzleExpression& node) override;
ExpressionPtr Clone(UnaryExpression& node) override;
ExpressionPtr Clone(VariableExpression& node) override;
ExpressionPtr Clone(VariableValueExpression& node) override;
StatementPtr Clone(BranchStatement& node) override;
StatementPtr Clone(ConditionalStatement& node) override;
@@ -166,7 +166,7 @@ namespace Nz::ShaderAst
void Validate(IntrinsicExpression& node);
void Validate(SwizzleExpression& node);
void Validate(UnaryExpression& node);
void Validate(VariableExpression& node);
void Validate(VariableValueExpression& node);
ExpressionType ValidateBinaryOp(BinaryType op, const ExpressionPtr& leftExpr, const ExpressionPtr& rightExpr);
enum class IdentifierCategory