ShaderAst: Add NoOp node

This commit is contained in:
Jérôme Leclercq
2021-01-14 21:58:06 +01:00
parent a9f2e05b57
commit acb998f67e
17 changed files with 70 additions and 1 deletions

View File

@@ -574,6 +574,11 @@ namespace Nz
Append(var.name);
}
void GlslWriter::Visit(ShaderNodes::NoOp& /*node*/)
{
/* nothing to do */
}
void GlslWriter::Visit(ShaderNodes::ParameterVariable& var)
{
Append(var.name);
@@ -598,7 +603,7 @@ namespace Nz
bool first = true;
for (const ShaderNodes::StatementPtr& statement : node.statements)
{
if (!first)
if (!first && statement->GetType() != ShaderNodes::NodeType::NoOp)
AppendLine();
Visit(statement);

View File

@@ -137,6 +137,11 @@ namespace Nz
PushExpression(ShaderNodes::IntrinsicCall::Build(node.intrinsic, std::move(parameters)));
}
void ShaderAstCloner::Visit(ShaderNodes::NoOp& /*node*/)
{
PushStatement(ShaderNodes::NoOp::Build());
}
void ShaderAstCloner::Visit(ShaderNodes::Sample2D& node)
{
PushExpression(ShaderNodes::Sample2D::Build(CloneExpression(node.sampler), CloneExpression(node.coordinates)));

View File

@@ -90,6 +90,11 @@ namespace Nz
Visit(param);
}
void ShaderAstRecursiveVisitor::Visit(ShaderNodes::NoOp& /*node*/)
{
/* Nothing to do */
}
void ShaderAstRecursiveVisitor::Visit(ShaderNodes::Sample2D& node)
{
Visit(node.sampler);

View File

@@ -87,6 +87,11 @@ namespace Nz
Serialize(node);
}
void Visit(ShaderNodes::NoOp& node) override
{
Serialize(node);
}
void Visit(ShaderNodes::Sample2D& node) override
{
Serialize(node);
@@ -276,6 +281,11 @@ namespace Nz
Type(node.type);
}
void ShaderAstSerializerBase::Serialize(ShaderNodes::NoOp& /*node*/)
{
/* Nothing to do */
}
void ShaderAstSerializerBase::Serialize(ShaderNodes::Sample2D& node)
{
Node(node.sampler);
@@ -682,6 +692,7 @@ namespace Nz
HandleType(ExpressionStatement);
HandleType(Identifier);
HandleType(IntrinsicCall);
HandleType(NoOp);
HandleType(Sample2D);
HandleType(SwizzleOp);
HandleType(StatementBlock);

View File

@@ -73,6 +73,11 @@ namespace Nz
throw std::runtime_error("unhandled IntrinsicCall node");
}
void ShaderAstVisitorExcept::Visit(ShaderNodes::NoOp& node)
{
throw std::runtime_error("unhandled NoOp node");
}
void ShaderAstVisitorExcept::Visit(ShaderNodes::Sample2D& /*node*/)
{
throw std::runtime_error("unhandled Sample2D node");

View File

@@ -79,6 +79,11 @@ namespace Nz::ShaderNodes
visitor.Visit(*this);
}
void NoOp::Visit(ShaderAstVisitor& visitor)
{
visitor.Visit(*this);
}
ShaderExpressionType AssignOp::GetExpressionType() const
{
return left->GetExpressionType();

View File

@@ -605,6 +605,11 @@ namespace Nz
}
}
void SpirvAstVisitor::Visit(ShaderNodes::NoOp& /*node*/)
{
// nothing to do
}
void SpirvAstVisitor::Visit(ShaderNodes::Sample2D& node)
{
UInt32 typeId = m_writer.GetTypeId(ShaderNodes::BasicType::Float4);