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

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

@@ -471,9 +471,9 @@ namespace Nz::ShaderAst
return clone;
}
ExpressionPtr AstCloner::Clone(VariableExpression& node)
ExpressionPtr AstCloner::Clone(VariableValueExpression& node)
{
auto clone = std::make_unique<VariableExpression>();
auto clone = std::make_unique<VariableValueExpression>();
clone->variableId = node.variableId;
clone->cachedExpressionType = node.cachedExpressionType;

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

@@ -104,7 +104,7 @@ namespace Nz::ShaderAst
node.expression->Visit(*this);
}
void AstRecursiveVisitor::Visit(VariableExpression& /*node*/)
void AstRecursiveVisitor::Visit(VariableValueExpression& /*node*/)
{
/* Nothing to do */
}

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

@@ -177,7 +177,7 @@ namespace Nz::ShaderAst
Enum(node.components[i]);
}
void AstSerializerBase::Serialize(VariableExpression& node)
void AstSerializerBase::Serialize(VariableValueExpression& node)
{
SizeT(node.variableId);
}

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

@@ -128,7 +128,7 @@ namespace Nz::ShaderAst
}
}
void ShaderAstValueCategory::Visit(VariableExpression& /*node*/)
void ShaderAstValueCategory::Visit(VariableValueExpression& /*node*/)
{
m_expressionCategory = ExpressionCategory::LValue;
}

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

@@ -161,7 +161,7 @@ namespace Nz::ShaderAst
m_currentVariableDeclIndex = {};
}
void DependencyCheckerVisitor::Visit(VariableExpression& node)
void DependencyCheckerVisitor::Visit(VariableValueExpression& node)
{
assert(m_currentFunctionIndex);
if (m_currentVariableDeclIndex)

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

@@ -157,9 +157,9 @@ namespace Nz::ShaderAst
return clone;
}
ExpressionPtr IndexRemapperVisitor::Clone(VariableExpression& node)
ExpressionPtr IndexRemapperVisitor::Clone(VariableValueExpression& node)
{
VariableExpressionPtr clone = static_unique_pointer_cast<VariableExpression>(AstCloner::Clone(node));
VariableValueExpressionPtr clone = static_unique_pointer_cast<VariableValueExpression>(AstCloner::Clone(node));
assert(clone->variableId);
clone->variableId = Retrieve(m_context->newVarIndices, clone->variableId);

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

@@ -684,9 +684,9 @@ namespace Nz::ShaderAst
return clone;
}
ExpressionPtr SanitizeVisitor::Clone(VariableExpression& node)
ExpressionPtr SanitizeVisitor::Clone(VariableValueExpression& node)
{
auto clone = static_unique_pointer_cast<VariableExpression>(AstCloner::Clone(node));
auto clone = static_unique_pointer_cast<VariableValueExpression>(AstCloner::Clone(node));
Validate(*clone);
return clone;
@@ -1678,7 +1678,7 @@ namespace Nz::ShaderAst
case IdentifierCategory::Variable:
{
// Replace IdentifierExpression by VariableExpression
auto varExpr = std::make_unique<VariableExpression>();
auto varExpr = std::make_unique<VariableValueExpression>();
varExpr->cachedExpressionType = m_context->variableTypes.Retrieve(identifierData->index);
varExpr->variableId = identifierData->index;
@@ -1731,7 +1731,7 @@ namespace Nz::ShaderAst
auto variableDeclaration = ShaderBuilder::DeclareVariable("cachedResult", std::move(expression)); //< Validation will prevent name-clash if required
Validate(*variableDeclaration);
auto varExpr = std::make_unique<VariableExpression>();
auto varExpr = std::make_unique<VariableValueExpression>();
varExpr->variableId = *variableDeclaration->varIndex;
m_context->currentStatementList->push_back(std::move(variableDeclaration));
@@ -2903,7 +2903,7 @@ namespace Nz::ShaderAst
node.cachedExpressionType = exprType;
}
void SanitizeVisitor::Validate(VariableExpression& node)
void SanitizeVisitor::Validate(VariableValueExpression& node)
{
node.cachedExpressionType = m_context->variableTypes.Retrieve(node.variableId);
}