X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=0c4b98cbb2c8fd9de87ec21b553d911febde227a;hp=fdff3fe657aa56972690304c587e5bf61e8b3816;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=3a6eb030fb4eca4c2a317f270704fddf31613130 diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index fdff3fe6..0c4b98cb 100644 --- a/source/glsl/validate.cpp +++ b/source/glsl/validate.cpp @@ -12,11 +12,6 @@ namespace Msp { namespace GL { namespace SL { -Validator::Validator(): - stage(0), - last_provoker(0) -{ } - void Validator::diagnose(Node &node, Node &provoking_node, Diagnostic::Severity severity, const string &message) { Diagnostic diag; @@ -39,13 +34,6 @@ void Validator::add_info(Node &node, const string &message) } -DeclarationValidator::DeclarationValidator(): - scope(GLOBAL), - iface_layout(0), - iface_block(0), - variable(0) -{ } - const char *DeclarationValidator::describe_variable(ScopeType scope) { switch(scope) @@ -61,16 +49,16 @@ const char *DeclarationValidator::describe_variable(ScopeType scope) void DeclarationValidator::visit(Layout &layout) { - for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) + for(const Layout::Qualifier &q: layout.qualifiers) { bool allowed = false; string err_descr; bool value = true; - if(i->name=="location") + if(q.name=="location") allowed = (variable && scope==GLOBAL); - else if(i->name=="binding" || i->name=="set") + else if(q.name=="binding" || q.name=="set") { - if(i->name=="set") + if(q.name=="set") { error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL"); continue; @@ -91,7 +79,7 @@ void DeclarationValidator::visit(Layout &layout) err_descr = "non-uniform interface block"; } } - else if(i->name=="constant_id") + else if(q.name=="constant_id") { allowed = (variable && scope==GLOBAL); if(allowed) @@ -113,35 +101,35 @@ void DeclarationValidator::visit(Layout &layout) } } } - else if(i->name=="offset") + else if(q.name=="offset") allowed = (variable && scope==INTERFACE_BLOCK && iface_block->interface=="uniform"); - else if(i->name=="align") + else if(q.name=="align") allowed = (scope==INTERFACE_BLOCK && iface_block->interface=="uniform"); - else if(i->name=="points") + else if(q.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") + else if(q.name=="lines" || q.name=="lines_adjacency" || q.name=="triangles" || q.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") + else if(q.name=="line_strip" || q.name=="triangle_strip") { allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out"); value = false; } - else if(i->name=="invocations") + else if(q.name=="invocations") allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in"); - else if(i->name=="max_vertices") + else if(q.name=="max_vertices") allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out"); - else if(i->name=="std140" || i->name=="std430") + else if(q.name=="std140" || q.name=="std430") { allowed = (iface_block && !variable && iface_block->interface=="uniform"); value = false; } - else if(i->name=="column_major" || i->name=="row_major") + else if(q.name=="column_major" || q.name=="row_major") { allowed = (variable && scope==INTERFACE_BLOCK); if(allowed) @@ -167,12 +155,12 @@ void DeclarationValidator::visit(Layout &layout) else err_descr = "unknown declaration"; } - error(layout, format("Layout qualifier '%s' not allowed on %s", i->name, err_descr)); + error(layout, format("Layout qualifier '%s' not allowed on %s", q.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)); + else if(value && !q.has_value) + error(layout, format("Layout qualifier '%s' requires a value", q.name)); + else if(!value && q.has_value) + error(layout, format("Layout qualifier '%s' does not allow a value", q.name)); } } @@ -298,17 +286,13 @@ void DeclarationValidator::visit(InterfaceBlock &iface) 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); + for(const RefPtr &p: func.parameters) + p->visit(*this); scope = FUNCTION; func.body.visit(*this); } -IdentifierValidator::IdentifierValidator(): - anonymous_block(false) -{ } - void IdentifierValidator::multiple_definition(const string &name, Statement &statement, Statement &previous) { error(statement, format("Multiple definition of %s", name)); @@ -318,7 +302,7 @@ void IdentifierValidator::multiple_definition(const string &name, Statement &sta Statement *IdentifierValidator::find_definition(const string &name) { BlockDeclarationMap *decls = &declarations[current_block]; - BlockDeclarationMap::const_iterator i = decls->find(name); + auto i = decls->find(name); if(i==decls->end() && anonymous_block) { decls = &declarations[current_block->parent]; @@ -362,7 +346,7 @@ void IdentifierValidator::visit(VariableDeclaration &var) void IdentifierValidator::visit(InterfaceBlock &iface) { string key = format("%s %s", iface.interface, iface.block_name); - map::const_iterator i = interface_blocks.find(key); + 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 @@ -382,16 +366,15 @@ void IdentifierValidator::visit(InterfaceBlock &iface) if(iface.instance_name.empty() && iface.struct_declaration) { // Inject anonymous interface block members into the global scope - const map &iface_vars = iface.struct_declaration->members.variables; - for(map::const_iterator j=iface_vars.begin(); j!=iface_vars.end(); ++j) - check_definition(j->first, *j->second); + for(const auto &kvp: iface.struct_declaration->members.variables) + check_definition(kvp.first, *kvp.second); } } void IdentifierValidator::visit(FunctionDeclaration &func) { string key = func.name+func.signature; - map::const_iterator i = overloaded_functions.find(key); + auto i = overloaded_functions.find(key); if(i==overloaded_functions.end()) overloaded_functions.insert(make_pair(key, &func)); else if(func.return_type_declaration && i->second->return_type_declaration!=func.return_type_declaration) @@ -460,7 +443,7 @@ void ReferenceValidator::visit(FunctionCall &call) bool have_declaration = call.constructor; if(!call.constructor) { - map::iterator i = stage->functions.lower_bound(call.name); + auto i = stage->functions.lower_bound(call.name); have_declaration = (i!=stage->functions.end() && i->second->name==call.name); } @@ -468,7 +451,7 @@ void ReferenceValidator::visit(FunctionCall &call) { bool valid_types = true; string signature; - for(NodeArray::const_iterator j=call.arguments.begin(); (valid_types && j!=call.arguments.end()); ++j) + for(auto j=call.arguments.begin(); (valid_types && j!=call.arguments.end()); ++j) { if((*j)->type) append(signature, ", ", (*j)->type->name); @@ -507,11 +490,6 @@ void ReferenceValidator::visit(FunctionDeclaration &func) } -ExpressionValidator::ExpressionValidator(): - current_function(0), - constant_expression(false) -{ } - void ExpressionValidator::visit(VariableReference &var) { if(var.declaration && constant_expression && !var.declaration->constant) @@ -699,20 +677,16 @@ void ExpressionValidator::visit(Return &ret) } -FlowControlValidator::FlowControlValidator(): - reachable(true) -{ } - void FlowControlValidator::visit(Block &block) { - for(NodeList::const_iterator i=block.body.begin(); i!=block.body.end(); ++i) + for(const RefPtr &s: block.body) { if(!reachable) { - diagnose(**i, Diagnostic::WARN, "Unreachable code detected"); + diagnose(*s, Diagnostic::WARN, "Unreachable code detected"); break; } - (*i)->visit(*this); + s->visit(*this); } } @@ -747,10 +721,7 @@ void FlowControlValidator::visit(Iteration &iter) int StageInterfaceValidator::get_location(const Layout &layout) { - for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) - if(i->name=="location") - return i->value; - return -1; + return get_layout_value(layout, "location", -1); } void StageInterfaceValidator::visit(VariableDeclaration &var) @@ -791,7 +762,7 @@ void StageInterfaceValidator::visit(VariableDeclaration &var) unsigned loc_count = LocationCounter().apply(var); for(unsigned i=0; i::const_iterator j = used.find(location+i); + auto j = used.find(location+i); if(j!=used.end()) { error(var, format("Overlapping location %d for '%s %s'", location+i, var.interface, var.name)); @@ -806,16 +777,16 @@ void StageInterfaceValidator::visit(VariableDeclaration &var) void GlobalInterfaceValidator::apply(Module &module) { - for(list::iterator i=module.stages.begin(); i!=module.stages.end(); ++i) + for(Stage &s: module.stages) { - stage = &*i; - i->content.visit(*this); + stage = &s; + s.content.visit(*this); } } void GlobalInterfaceValidator::check_uniform(const Uniform &uni) { - map::const_iterator i = used_names.find(uni.name); + auto i = used_names.find(uni.name); if(i!=used_names.end()) { if(uni.location>=0 && i->second->location>=0 && i->second->location!=uni.location) @@ -845,7 +816,7 @@ void GlobalInterfaceValidator::check_uniform(const Uniform &uni) if(uni.location>=0) { - map::const_iterator j = used_locations.find(uni.location); + auto j = used_locations.find(uni.location); if(j!=used_locations.end()) { if(j->second->name!=uni.name) @@ -864,7 +835,7 @@ void GlobalInterfaceValidator::check_uniform(const Uniform &uni) if(uni.bind_point>=0) { map &used = used_bindings[uni.desc_set]; - map::const_iterator j = used.find(uni.bind_point); + auto j = used.find(uni.bind_point); if(j!=used.end()) { if(j->second->name!=uni.name)