X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=154189aa2bc8c353398b9b92a6a521c47c5afe59;hb=f2ad2730858046b08e8147297fa01bf3499b86a3;hp=b8710509e8d32fe424062f6c6558976ceab6da35;hpb=3f44e477f81983c66947fe8a6d8640a3b2f9e0b3;p=libs%2Fgl.git diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index b8710509..154189aa 100644 --- a/source/glsl/validate.cpp +++ b/source/glsl/validate.cpp @@ -38,29 +38,139 @@ void Validator::add_info(Node &node, const string &message) } -TypeValidator::TypeValidator(): - in_struct(false) +DeclarationValidator::DeclarationValidator(): + scope(GLOBAL), + iface_layout(0), + iface_block(0), + variable(0) { } -void TypeValidator::visit(BasicTypeDeclaration &type) +const char *DeclarationValidator::describe_variable(ScopeType scope) { - if(type.kind==BasicTypeDeclaration::VECTOR) + switch(scope) { - BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID; - if(BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type)) - base_kind = basic_base->kind; - if(base_kind!=BasicTypeDeclaration::BOOL && base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT) - error(type, format("Invalid base type '%s' for vector type '%s'", type.base, type.name)); + case GLOBAL: return "global variable"; + case STRUCT: return "struct member"; + case INTERFACE_BLOCK: return "interface block member"; + case FUNCTION_PARAM: return "function parameter"; + case FUNCTION: return "local variable"; + default: return "variable"; } - else if(type.kind==BasicTypeDeclaration::ARRAY) +} + +void DeclarationValidator::visit(Layout &layout) +{ + for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) { - if(BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type)) - if(basic_base->kind==BasicTypeDeclaration::VOID) - error(type, format("Invalid base type '%s' for array type '%s'", type.base, type.name)); + bool allowed = false; + string err_descr; + bool value = true; + if(i->name=="location") + allowed = (variable && scope==GLOBAL); + else if(i->name=="binding" || i->name=="set") + { + if(variable) + { + TypeDeclaration *type = variable->type_declaration; + while(BasicTypeDeclaration *basic = dynamic_cast(type)) + type = basic->base_type; + allowed = (scope==GLOBAL && dynamic_cast(type)); + err_descr = "variable of non-opaque type"; + } + else if(iface_block) + allowed = true; + } + else if(i->name=="constant_id") + { + allowed = (variable && scope==GLOBAL); + if(allowed) + { + if(!variable->constant) + { + allowed = false; + err_descr = "non-constant variable"; + } + else + { + BasicTypeDeclaration *basic = dynamic_cast(variable->type_declaration); + if(!basic || basic->kindkind>BasicTypeDeclaration::INT) + { + allowed = false; + err_descr = format("variable of type '%s'", + (variable->type_declaration ? variable->type_declaration->name : variable->type)); + } + } + } + } + else if(i->name=="offset") + allowed = (variable && scope==INTERFACE_BLOCK); + else if(i->name=="points") + { + allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out")); + value = false; + } + else if(i->name=="lines" || i->name=="lines_adjacency" || i->name=="triangles" || i->name=="triangles_adjacency") + { + allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in"); + value = false; + } + else if(i->name=="line_strip" || i->name=="triangle_strip") + { + allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out"); + value = false; + } + else if(i->name=="invocations") + allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in"); + else if(i->name=="max_vertices") + allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out"); + else if(i->name=="std140" || i->name=="std430") + { + allowed = (iface_block && !variable && iface_block->interface=="uniform"); + value = false; + } + + if(!allowed) + { + if(err_descr.empty()) + { + if(variable) + err_descr = describe_variable(scope); + else if(iface_block) + err_descr = "interface block"; + else if(iface_layout) + err_descr = format("interface '%s'", iface_layout->interface); + else + err_descr = "unknown declaration"; + } + error(layout, format("Layout qualifier '%s' not allowed on %s", i->name, err_descr)); + } + else if(value && !i->has_value) + error(layout, format("Layout qualifier '%s' requires a value", i->name)); + else if(!value && i->has_value) + error(layout, format("Layout qualifier '%s' does not allow a value", i->name)); } } -void TypeValidator::visit(ImageTypeDeclaration &type) +void DeclarationValidator::visit(InterfaceLayout &layout) +{ + SetForScope set_layout(iface_layout, &layout); + TraversingVisitor::visit(layout); +} + +void DeclarationValidator::visit(BasicTypeDeclaration &type) +{ + BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type); + BasicTypeDeclaration::Kind base_kind = (basic_base ? basic_base->kind : BasicTypeDeclaration::VOID); + + if(type.kind==BasicTypeDeclaration::VECTOR && (base_kindBasicTypeDeclaration::FLOAT)) + error(type, format("Invalid base type '%s' for vector type '%s'", type.base, type.name)); + else if(type.kind==BasicTypeDeclaration::MATRIX && base_kind!=BasicTypeDeclaration::VECTOR) + error(type, format("Invalid base type '%s' for matrix type '%s'", type.base, type.name)); + else if(type.kind==BasicTypeDeclaration::ARRAY && basic_base && base_kind==BasicTypeDeclaration::VOID) + error(type, format("Invalid base type '%s' for array type '%s'", type.base, type.name)); +} + +void DeclarationValidator::visit(ImageTypeDeclaration &type) { BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID; if(BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type)) @@ -69,37 +179,108 @@ void TypeValidator::visit(ImageTypeDeclaration &type) error(type, format("Invalid base type '%s' for image type '%s'", type.base, type.name)); } -void TypeValidator::visit(StructDeclaration &strct) +void DeclarationValidator::visit(StructDeclaration &strct) { - SetFlag set_struct(in_struct); + SetForScope set_scope(scope, (scope!=INTERFACE_BLOCK ? STRUCT : scope)); TraversingVisitor::visit(strct); } -void TypeValidator::visit(VariableDeclaration &var) +void DeclarationValidator::visit(VariableDeclaration &var) { - if(in_struct) + SetForScope set_var(variable, &var); + + const char *descr = describe_variable(scope); + + if(var.layout) { - if(var.layout) - error(var, "Struct members can't have layouts"); - if(var.init_expression) - error(var, "Struct members can't have initializers"); + if(scope!=GLOBAL && scope!=INTERFACE_BLOCK) + error(var, format("Layout qualifier not allowed on %s", descr)); + else + var.layout->visit(*this); } - TraversingVisitor::visit(var); + if(var.constant) + { + if(scope==STRUCT || scope==INTERFACE_BLOCK) + error(var, format("Constant qualifier not allowed on %s", descr)); + } + + if(!var.interpolation.empty() || !var.sampling.empty()) + { + if(var.interface!="in" && stage->type==Stage::VERTEX) + error(var, "Interpolation qualifier not allowed on vertex input"); + else if(var.interface!="out" && stage->type==Stage::FRAGMENT) + error(var, "Interpolation qualifier not allowed on fragment output"); + else if((var.interface!="in" && var.interface!="out") || (scope==FUNCTION_PARAM || scope==FUNCTION)) + error(var, "Interpolation qualifier not allowed on non-interpolated variable"); + } + + if(!var.interface.empty()) + { + if(iface_block && var.interface!=iface_block->interface) + error(var, format("Mismatched interface qualifier '%s' inside '%s' block", var.interface, iface_block->interface)); + else if(scope==STRUCT || scope==FUNCTION) + error(var, format("Interface qualifier not allowed on %s", descr)); + } + + TypeDeclaration *type = var.type_declaration; + while(BasicTypeDeclaration *basic = dynamic_cast(type)) + type = basic->base_type; + if(dynamic_cast(type)) + { + if(scope!=GLOBAL && scope!=FUNCTION_PARAM) + error(var, format("Type '%s' not allowed on %s", type->name, descr)); + else if(scope==GLOBAL && var.interface!="uniform") + error(var, format("Type '%s' only allowed with uniform interface", type->name)); + } + + if(var.init_expression) + { + if(scope==GLOBAL && !var.constant) + error(var, format("Initializer not allowed on non-constant %s", descr)); + else if(scope!=GLOBAL && scope!=FUNCTION) + error(var, format("Initializer not allowed on %s", descr)); + else + var.init_expression->visit(*this); + } } +void DeclarationValidator::visit(InterfaceBlock &iface) +{ + SetForScope set_scope(scope, INTERFACE_BLOCK); + SetForScope set_iface(iface_block, &iface); -DeclarationValidator::DeclarationValidator(): + 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); + for(NodeArray::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) + (*i)->visit(*this); + scope = FUNCTION; + func.body.visit(*this); +} + + +IdentifierValidator::IdentifierValidator(): anonymous_block(false) { } -void DeclarationValidator::multiple_definition(const string &name, Statement &statement, Statement &previous) +void IdentifierValidator::multiple_definition(const string &name, Statement &statement, Statement &previous) { error(statement, format("Multiple definition of %s", name)); add_info(previous, "Previous definition is here"); } -Statement *DeclarationValidator::find_definition(const string &name) +Statement *IdentifierValidator::find_definition(const string &name) { BlockDeclarationMap *decls = &declarations[current_block]; BlockDeclarationMap::const_iterator i = decls->find(name); @@ -111,7 +292,7 @@ Statement *DeclarationValidator::find_definition(const string &name) return (i!=decls->end() ? i->second : 0); } -void DeclarationValidator::check_definition(const string &name, Statement &statement) +void IdentifierValidator::check_definition(const string &name, Statement &statement) { if(Statement *previous = find_definition(name)) multiple_definition(format("'%s'", name), statement, *previous); @@ -119,46 +300,46 @@ void DeclarationValidator::check_definition(const string &name, Statement &state record_definition(name, statement); } -void DeclarationValidator::record_definition(const string &name, Statement &statement) +void IdentifierValidator::record_definition(const string &name, Statement &statement) { declarations[current_block].insert(make_pair(name, &statement)); if(anonymous_block) declarations[current_block->parent].insert(make_pair(name, &statement)); } -void DeclarationValidator::visit(TypeDeclaration &type) +void IdentifierValidator::visit(TypeDeclaration &type) { check_definition(type.name, type); } -void DeclarationValidator::visit(StructDeclaration &strct) +void IdentifierValidator::visit(StructDeclaration &strct) { check_definition(strct.name, strct); TraversingVisitor::visit(strct); } -void DeclarationValidator::visit(VariableDeclaration &var) +void IdentifierValidator::visit(VariableDeclaration &var) { check_definition(var.name, var); TraversingVisitor::visit(var); } -void DeclarationValidator::visit(InterfaceBlock &iface) +void IdentifierValidator::visit(InterfaceBlock &iface) { - string key = iface.interface+iface.name; + string key = iface.interface+iface.block_name; map::const_iterator i = interface_blocks.find(key); if(i!=interface_blocks.end()) - multiple_definition(format("interface block '%s %s'", iface.interface, iface.name), iface, *i->second); + 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(iface.name)) + if(Statement *previous = find_definition(iface.block_name)) { if(!dynamic_cast(previous)) - multiple_definition(format("'%s'", iface.name), iface, *previous); + multiple_definition(format("'%s'", iface.block_name), iface, *previous); } else - record_definition(iface.name, iface); + record_definition(iface.block_name, iface); if(!iface.instance_name.empty()) check_definition(iface.instance_name, iface); @@ -172,7 +353,7 @@ void DeclarationValidator::visit(InterfaceBlock &iface) } } -void DeclarationValidator::visit(FunctionDeclaration &func) +void IdentifierValidator::visit(FunctionDeclaration &func) { string key = func.name+func.signature; map::const_iterator i = overloaded_functions.find(key); @@ -279,7 +460,7 @@ void ReferenceValidator::visit(VariableDeclaration &var) void ReferenceValidator::visit(InterfaceBlock &iface) { if(!iface.struct_declaration) - error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.name)); + error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.block_name)); TraversingVisitor::visit(iface); } @@ -291,6 +472,10 @@ void ReferenceValidator::visit(FunctionDeclaration &func) } +ExpressionValidator::ExpressionValidator(): + current_function(0) +{ } + void ExpressionValidator::visit(Swizzle &swizzle) { unsigned size = 0; @@ -399,6 +584,31 @@ void ExpressionValidator::visit(VariableDeclaration &var) TraversingVisitor::visit(var); } +void ExpressionValidator::visit(FunctionDeclaration &func) +{ + SetForScope set_func(current_function, &func); + TraversingVisitor::visit(func); +} + +void ExpressionValidator::visit(Return &ret) +{ + if(current_function && current_function->return_type_declaration) + { + TypeDeclaration *return_type = current_function->return_type_declaration; + BasicTypeDeclaration *basic_return = dynamic_cast(return_type); + if(ret.expression) + { + if(ret.expression->type && ret.expression->type!=return_type) + error(ret, format("Return expression type '%s' is incompatible with declared return type '%s'", + ret.expression->type->name, return_type->name)); + } + else if(!basic_return || basic_return->kind!=BasicTypeDeclaration::VOID) + error(ret, "Return statement without an expression in a function not returning 'void'"); + } + + TraversingVisitor::visit(ret); +} + } // namespace SL } // namespace GL } // namespace Msp