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())
+ if(has_layout_qualifier(var.declaration->layout.get(), "constant_id"))
error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
}
}
var.layout->visit(*this);
if(var.init_expression)
{
- 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;
- }
+ ConstantKind const_kind = (!var.constant ? NOT_CONSTANT :
+ has_layout_qualifier(var.layout.get(), "constant_id") ? FIXED_CONSTANT : SPEC_CONSTANT);
SetForScope<ConstantKind> set_const(constant_expression, const_kind);
TraversingVisitor::visit(var.init_expression);
}
-int StageInterfaceValidator::get_location(const Layout &layout)
-{
- return get_layout_value(layout, "location", -1);
-}
-
void StageInterfaceValidator::visit(VariableDeclaration &var)
{
- int location = (var.layout ? get_location(*var.layout) : -1);
+ int location = get_layout_value(var.layout.get(), "location");
if(var.interface=="in" && var.linked_declaration)
{
const Layout *linked_layout = var.linked_declaration->layout.get();
- int linked_location = (linked_layout ? get_location(*linked_layout) : -1);
+ int linked_location = get_layout_value(linked_layout, "location");
if(linked_location!=location)
{
error(var, format("Mismatched location %d for 'in %s'", location, var.name));
error(*uni.node, format("Mismatched location %d for uniform '%s'", uni.location, uni.name));
add_info(*i->second->node, format("Previously declared here with location %d", i->second->location));
}
+ if(i->second->desc_set!=uni.desc_set)
+ {
+ error(*uni.node, format("Mismatched descriptor set %d for uniform '%s'", uni.desc_set, uni.name));
+ add_info(*i->second->node, format("Previously declared here with descriptor set %d", i->second->desc_set));
+ }
if(uni.bind_point>=0 && i->second->bind_point>=0 && i->second->bind_point!=uni.bind_point)
{
error(*uni.node, format("Mismatched binding %d for uniform '%s'", uni.bind_point, uni.name));
uni.name = var.name;
if(var.layout)
{
- uni.location = get_layout_value(*var.layout, "location");
+ uni.location = get_layout_value(var.layout.get(), "location");
uni.loc_count = LocationCounter().apply(var);
- uni.desc_set = get_layout_value(*var.layout, "set", 0);
- uni.bind_point = get_layout_value(*var.layout, "binding");
+ uni.desc_set = get_layout_value(var.layout.get(), "set", 0);
+ uni.bind_point = get_layout_value(var.layout.get(), "binding");
}
uniforms.push_back(uni);
uni.name = iface.block_name;
if(iface.layout)
{
- uni.desc_set = get_layout_value(*iface.layout, "set", 0);
- uni.bind_point = get_layout_value(*iface.layout, "binding");
+ uni.desc_set = get_layout_value(iface.layout.get(), "set", 0);
+ uni.bind_point = get_layout_value(iface.layout.get(), "binding");
}
uniforms.push_back(uni);