-#include <algorithm>
#include <cstring>
+#include <msp/core/algorithm.h>
#include <msp/core/raii.h>
#include <msp/strings/format.h>
#include <msp/strings/utils.h>
void DeclarationValidator::visit(Layout &layout)
{
+ bool push_constant = false;
+ bool binding = false;
for(const Layout::Qualifier &q: layout.qualifiers)
{
bool allowed = false;
allowed = (variable && scope==GLOBAL);
else if(q.name=="binding" || q.name=="set")
{
+ binding = true;
+
if(q.name=="set")
{
error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL");
err_descr = "non-matrix variable";
}
}
+ else if(q.name=="push_constant")
+ {
+ push_constant = true;
+ allowed = (iface_block && !variable && iface_block->interface=="uniform");
+ value = false;
+ }
if(!allowed)
{
else if(!value && q.has_value)
error(layout, format("Layout qualifier '%s' does not allow a value", q.name));
}
+
+ if(push_constant && binding)
+ error(layout, "Layout qualifier 'push_constant' not allowed together with 'binding' or 'set'");
}
void DeclarationValidator::visit(InterfaceLayout &layout)
}
else if(kind==BasicTypeDeclaration::VOID)
error(var, "Type 'void' not allowed on variable");
- else if(kind==BasicTypeDeclaration::BOOL && !var.interface.empty() && var.source!=BUILTIN_SOURCE)
- error(var, "Type 'bool' not allowed on interface variable");
+ else if(kind==BasicTypeDeclaration::BOOL && var.source!=BUILTIN_SOURCE)
+ {
+ if(scope==INTERFACE_BLOCK)
+ error(var, "Type 'bool' not allowed in an interface block");
+ else if(!var.interface.empty())
+ error(var, "Type 'bool' not allowed on interface variable");
+ }
if(var.init_expression)
{
void ExpressionValidator::visit(VariableReference &var)
{
- if(var.declaration && constant_expression && !var.declaration->constant)
- error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+ if(var.declaration && constant_expression)
+ {
+ if(!var.declaration->constant)
+ error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+ else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
+ {
+ auto i = find_member(var.declaration->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+ if(i!=var.declaration->layout->qualifiers.end())
+ error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
+ }
+ }
}
void ExpressionValidator::visit(InterfaceBlockReference &iface)
int flavour = -1;
for(unsigned i=0; i<swizzle.count; ++i)
{
- unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+ unsigned component_flavour = (std::find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
if(flavour==-1)
flavour = component_flavour;
else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
TraversingVisitor::visit(ternary);
}
+void ExpressionValidator::visit(StructDeclaration &strct)
+{
+ SetFlag set_struct(in_struct);
+ TraversingVisitor::visit(strct);
+}
+
void ExpressionValidator::visit(VariableDeclaration &var)
{
if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
var.layout->visit(*this);
if(var.init_expression)
{
- SetFlag set_const(constant_expression, var.constant);
+ ConstantKind const_kind = (var.constant ? SPEC_CONSTANT : NOT_CONSTANT);
+ if(var.layout)
+ {
+ auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+ if(i!=var.layout->qualifiers.end())
+ const_kind = FIXED_CONSTANT;
+ }
+
+ SetForScope<ConstantKind> set_const(constant_expression, const_kind);
TraversingVisitor::visit(var.init_expression);
}
if(var.array_size)
{
- SetFlag set_const(constant_expression);
+ SetForScope<ConstantKind> set_const(constant_expression, (in_struct || !var.interface.empty() ? FIXED_CONSTANT : SPEC_CONSTANT));
TraversingVisitor::visit(var.array_size);
}
}