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

Shader: Rename ConstantIndexExpression to ConstantExpression

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-08 15:24:22 +02:00
parent 3a31c77524
commit 996b5ef85c
16 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Shader/Ast/AstCloner.cpp
View File

@@ -303,9 +303,9 @@ namespace Nz::ShaderAst
return clone;
}
ExpressionPtr AstCloner::Clone(ConstantIndexExpression& node)
ExpressionPtr AstCloner::Clone(ConstantExpression& node)
{
auto clone = std::make_unique<ConstantIndexExpression>();
auto clone = std::make_unique<ConstantExpression>();
clone->constantId = node.constantId;
clone->cachedExpressionType = node.cachedExpressionType;

2
src/Nazara/Shader/Ast/AstOptimizer.cpp
View File

@@ -839,7 +839,7 @@ namespace Nz::ShaderAst
return AstCloner::Clone(*node.falsePath);
}
ExpressionPtr AstOptimizer::Clone(ConstantIndexExpression& node)
ExpressionPtr AstOptimizer::Clone(ConstantExpression& node)
{
if (!m_options.constantQueryCallback)
return AstCloner::Clone(node);

2
src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp
View File

@@ -67,7 +67,7 @@ namespace Nz::ShaderAst
/* Nothing to do */
}
void AstRecursiveVisitor::Visit(ConstantIndexExpression& /*node*/)
void AstRecursiveVisitor::Visit(ConstantExpression& /*node*/)
{
/* Nothing to do */
}

2
src/Nazara/Shader/Ast/AstSerializer.cpp
View File

@@ -111,7 +111,7 @@ namespace Nz::ShaderAst
Node(expr);
}
void AstSerializerBase::Serialize(ConstantIndexExpression& node)
void AstSerializerBase::Serialize(ConstantExpression& node)
{
SizeT(node.constantId);
}

2
src/Nazara/Shader/Ast/AstUtils.cpp
View File

@@ -67,7 +67,7 @@ namespace Nz::ShaderAst
m_expressionCategory = ExpressionCategory::RValue;
}
void ShaderAstValueCategory::Visit(ConstantIndexExpression& /*node*/)
void ShaderAstValueCategory::Visit(ConstantExpression& /*node*/)
{
m_expressionCategory = ExpressionCategory::LValue;
}

6
src/Nazara/Shader/Ast/SanitizeVisitor.cpp
View File

@@ -577,7 +577,7 @@ namespace Nz::ShaderAst
return clone;
}
ExpressionPtr SanitizeVisitor::Clone(ConstantIndexExpression& node)
ExpressionPtr SanitizeVisitor::Clone(ConstantExpression& node)
{
if (node.constantId >= m_context->constantValues.size())
throw AstError{ "invalid constant index " + std::to_string(node.constantId) };
@@ -601,8 +601,8 @@ namespace Nz::ShaderAst
{
case Identifier::Type::Constant:
{
// Replace IdentifierExpression by ConstantIndexExpression
auto constantExpr = std::make_unique<ConstantIndexExpression>();
// Replace IdentifierExpression by ConstantExpression
auto constantExpr = std::make_unique<ConstantExpression>();
constantExpr->cachedExpressionType = GetExpressionType(m_context->constantValues[identifier->index]);
constantExpr->constantId = identifier->index;

2
src/Nazara/Shader/LangWriter.cpp
View File

@@ -664,7 +664,7 @@ namespace Nz
}, node.value);
}
void LangWriter::Visit(ShaderAst::ConstantIndexExpression& node)
void LangWriter::Visit(ShaderAst::ConstantExpression& node)
{
Append(Retrieve(m_currentState->constantNames, node.constantId));
}