Minor fixes

This commit is contained in:
Jérôme Leclercq
2022-02-18 19:37:37 +01:00
parent 24a2f96fd3
commit e504c4a982
3 changed files with 10 additions and 10 deletions

View File

@@ -849,9 +849,6 @@ namespace Nz::ShaderAst
pendingFunc.cloneNode = clone.get();
pendingFunc.node = &node;
for (auto& parameter : clone->parameters)
parameter.type = ResolveType(parameter.type);
if (clone->earlyFragmentTests.HasValue() && clone->earlyFragmentTests.GetResultingValue())
{
//TODO: warning and disable early fragment tests
@@ -2265,10 +2262,14 @@ namespace Nz::ShaderAst
if (!node.initialExpression)
throw AstError{ "variable must either have a type or an initial value" };
resolvedType = ResolveType(GetExpressionType(*node.initialExpression));
resolvedType = GetExpressionType(*node.initialExpression);
}
else
{
resolvedType = ResolveType(node.varType);
if (node.initialExpression)
TypeMustMatch(resolvedType, GetExpressionType(*node.initialExpression));
}
if (m_context->options.makeVariableNameUnique && FindIdentifier(node.varName) != nullptr)
{