void DeclarationValidator::visit(StructDeclaration &strct)
{
- SetForScope<ScopeType> set_scope(scope, (scope!=INTERFACE_BLOCK ? STRUCT : scope));
+ SetForScope<ScopeType> set_scope(scope, (strct.block_name.empty() ? STRUCT : INTERFACE_BLOCK));
+ SetForScope<VariableDeclaration *> set_iface(iface_block, strct.block_declaration);
TraversingVisitor::visit(strct);
}
void DeclarationValidator::visit(VariableDeclaration &var)
{
- SetForScope<VariableDeclaration *> set_var(variable, &var);
+ SetForScope<VariableDeclaration *> set_var((var.block_declaration ? iface_block : variable), &var);
const char *descr = describe_variable(scope);
else if(scope==GLOBAL && var.interface!="uniform")
error(var, format("Type '%s' only allowed with uniform interface", type->name));
}
+ else if(var.block_declaration)
+ {
+ if(stage->type==Stage::VERTEX && var.interface=="in")
+ error(var, "Interface block not allowed on vertex shader input");
+ else if(stage->type==Stage::FRAGMENT && var.interface=="out")
+ error(var, "Interface block not allowed on fragment shader output");
+ }
else if(kind==BasicTypeDeclaration::VOID)
error(var, "Type 'void' not allowed on variable");
else if(kind==BasicTypeDeclaration::BOOL && var.source!=BUILTIN_SOURCE)
}
}
-void DeclarationValidator::visit(InterfaceBlock &iface)
-{
- SetForScope<ScopeType> set_scope(scope, INTERFACE_BLOCK);
- SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
-
- if(stage->type==Stage::VERTEX && iface.interface=="in")
- error(iface, "Interface block not allowed on vertex shader input");
- else if(stage->type==Stage::FRAGMENT && iface.interface=="out")
- error(iface, "Interface block not allowed on fragment shader output");
-
- TraversingVisitor::visit(iface);
- if(iface.struct_declaration)
- iface.struct_declaration->visit(*this);
-}
-
void DeclarationValidator::visit(FunctionDeclaration &func)
{
SetForScope<ScopeType> set_scope(scope, FUNCTION_PARAM);
void IdentifierValidator::visit(StructDeclaration &strct)
{
- check_definition(strct.name, strct);
+ if(strct.block_name.empty())
+ check_definition(strct.name, strct);
TraversingVisitor::visit(strct);
}
void IdentifierValidator::visit(VariableDeclaration &var)
{
- check_definition(var.name, var);
- TraversingVisitor::visit(var);
-}
+ if(var.block_declaration)
+ {
+ string key = format("%s %s", var.interface, var.block_declaration->block_name);
+ auto i = interface_blocks.find(key);
+ if(i!=interface_blocks.end())
+ multiple_definition(format("interface block '%s %s'", var.interface, var.block_declaration->block_name), var, *i->second);
+ else
+ interface_blocks.insert(make_pair(key, &var));
-void IdentifierValidator::visit(InterfaceBlock &iface)
-{
- string key = format("%s %s", iface.interface, iface.block_name);
- auto i = interface_blocks.find(key);
- if(i!=interface_blocks.end())
- multiple_definition(format("interface block '%s %s'", iface.interface, iface.block_name), iface, *i->second);
- else
- interface_blocks.insert(make_pair(key, &iface));
+ if(Statement *previous = find_definition(var.block_declaration->block_name))
+ {
+ const VariableDeclaration *prev_var = dynamic_cast<const VariableDeclaration *>(previous);
+ if(!prev_var || !prev_var->block_declaration)
+ multiple_definition(format("'%s'", var.block_declaration->block_name), var, *previous);
+ }
+ else
+ record_definition(var.block_declaration->block_name, var);
- if(Statement *previous = find_definition(iface.block_name))
- {
- if(!dynamic_cast<InterfaceBlock *>(previous))
- multiple_definition(format("'%s'", iface.block_name), iface, *previous);
+ if(var.name.find(' ')!=string::npos)
+ {
+ // Inject anonymous interface block members into the global scope
+ for(const auto &kvp: var.block_declaration->members.variables)
+ check_definition(kvp.first, *kvp.second);
+ }
}
- else
- record_definition(iface.block_name, iface);
- if(!iface.instance_name.empty())
- check_definition(iface.instance_name, iface);
+ if(var.name.find(' ')==string::npos)
+ check_definition(var.name, var);
- if(iface.instance_name.empty() && iface.struct_declaration)
- {
- // Inject anonymous interface block members into the global scope
- for(const auto &kvp: iface.struct_declaration->members.variables)
- check_definition(kvp.first, *kvp.second);
- }
+ TraversingVisitor::visit(var);
}
void IdentifierValidator::visit(FunctionDeclaration &func)
if(!var.declaration)
error(var, format("Use of undeclared variable '%s'", var.name));
else if(stage->type!=Stage::VERTEX && var.declaration->interface=="in" && var.name.compare(0, 3, "gl_") && !var.declaration->linked_declaration)
- error(var, format("Use of unlinked input variable '%s'", var.name));
+ error(var, format("Use of unlinked input %s '%s'", (var.declaration->block_declaration ? "block" : "variable"), var.name));
}
void ReferenceValidator::visit(MemberAccess &memacc)
TraversingVisitor::visit(memacc);
}
-void ReferenceValidator::visit(InterfaceBlockReference &iface)
-{
- /* An interface block reference without a declaration should be impossible
- since references are generated based on existing declarations. */
- if(!iface.declaration)
- error(iface, format("Use of undeclared interface block '%s'", iface.name));
- else if(stage->type!=Stage::VERTEX && iface.declaration->interface=="in" && !iface.declaration->linked_block)
- error(iface, format("Use of unlinked input block '%s'", iface.name));
-}
-
void ReferenceValidator::visit(FunctionCall &call)
{
if((!call.constructor && !call.declaration) || (call.constructor && !call.type))
TraversingVisitor::visit(var);
}
-void ReferenceValidator::visit(InterfaceBlock &iface)
-{
- if(!iface.struct_declaration)
- error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.block_name));
- TraversingVisitor::visit(iface);
-}
-
void ReferenceValidator::visit(FunctionDeclaration &func)
{
if(!func.return_type_declaration)
if(var.declaration && constant_expression)
{
if(!var.declaration->constant)
- error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+ {
+ const char *kind = (var.declaration->block_declaration ? "interface block" : "non-constant variable");
+ error(var, format("Reference to %s '%s' in a constant expression", kind, var.name));
+ }
else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
{
if(has_layout_qualifier(var.declaration->layout.get(), "constant_id"))
}
}
-void ExpressionValidator::visit(InterfaceBlockReference &iface)
-{
- if(constant_expression)
- error(iface, format("Reference to interface block '%s' in a constant expression", iface.name));
-}
-
void ExpressionValidator::visit(Swizzle &swizzle)
{
unsigned size = 0;
Uniform uni;
uni.node = &var;
uni.type = var.type_declaration;
- uni.name = var.name;
+ uni.name = (var.block_declaration ? var.block_declaration->block_name : var.name);
if(var.layout)
{
- uni.location = get_layout_value(var.layout.get(), "location");
- uni.loc_count = LocationCounter().apply(var);
+ if(!var.block_declaration)
+ {
+ uni.location = get_layout_value(var.layout.get(), "location");
+ uni.loc_count = LocationCounter().apply(var);
+ }
uni.desc_set = get_layout_value(var.layout.get(), "set", 0);
uni.bind_point = get_layout_value(var.layout.get(), "binding");
}
}
}
-void GlobalInterfaceValidator::visit(InterfaceBlock &iface)
-{
- if(iface.interface=="uniform")
- {
- Uniform uni;
- uni.node = &iface;
- uni.type = iface.struct_declaration;
- uni.name = iface.block_name;
- if(iface.layout)
- {
- 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);
- check_uniform(uniforms.back());
- }
-}
-
} // namespace SL
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff