X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=883b950ff07f2e46d9aa0037ddfce2fa2719c425;hb=1a5dafe20e47c764f2914c341fb7b8f1fba59fb8;hp=1d0192fea1a44faa0bde09e4888601e5d874c608;hpb=fea5f2abec9b8e971d8467804f379cfcd81e9ff7;p=libs%2Fgl.git diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index 1d0192fe..883b950f 100644 --- a/source/glsl/validate.cpp +++ b/source/glsl/validate.cpp @@ -212,13 +212,14 @@ void DeclarationValidator::visit(ImageTypeDeclaration &type) void DeclarationValidator::visit(StructDeclaration &strct) { - SetForScope set_scope(scope, (scope!=INTERFACE_BLOCK ? STRUCT : scope)); + SetForScope set_scope(scope, (strct.block_name.empty() ? STRUCT : INTERFACE_BLOCK)); + SetForScope set_iface(iface_block, strct.block_declaration); TraversingVisitor::visit(strct); } void DeclarationValidator::visit(VariableDeclaration &var) { - SetForScope set_var(variable, &var); + SetForScope set_var((var.block_declaration ? iface_block : variable), &var); const char *descr = describe_variable(scope); @@ -275,6 +276,13 @@ void DeclarationValidator::visit(VariableDeclaration &var) 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) @@ -285,6 +293,9 @@ void DeclarationValidator::visit(VariableDeclaration &var) error(var, "Type 'bool' not allowed on interface variable"); } + if(var.array && !var.array_size) + error(var, "Array must have a size"); + if(var.init_expression) { if(scope==GLOBAL && !var.constant) @@ -296,21 +307,6 @@ void DeclarationValidator::visit(VariableDeclaration &var) } } -void DeclarationValidator::visit(InterfaceBlock &iface) -{ - SetForScope set_scope(scope, INTERFACE_BLOCK); - SetForScope 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 set_scope(scope, FUNCTION_PARAM); @@ -362,42 +358,43 @@ void IdentifierValidator::visit(TypeDeclaration &type) 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(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(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) @@ -445,7 +442,7 @@ void ReferenceValidator::visit(VariableReference &var) 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) @@ -455,16 +452,6 @@ 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)) @@ -504,13 +491,6 @@ void ReferenceValidator::visit(VariableDeclaration &var) 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) @@ -524,7 +504,10 @@ void ExpressionValidator::visit(VariableReference &var) 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")) @@ -533,12 +516,6 @@ void ExpressionValidator::visit(VariableReference &var) } } -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; @@ -902,11 +879,14 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var) 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"); } @@ -916,25 +896,6 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var) } } -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