X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=ec51c19cdd9cc90472a0b2471eff915823fae0d7;hp=1e57ed649041cacdfaa58b56fa0a56dee5642dc9;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=4414f0245005c8cfcd02b51ea394d612cc5776c4 diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index 1e57ed64..ec51c19c 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -1,7 +1,6 @@ +#include #include #include -#include -#include "builtin.h" #include "generate.h" using namespace std; @@ -10,848 +9,41 @@ namespace Msp { namespace GL { namespace SL { -void DeclarationCombiner::apply(Stage &stage) +void ConstantIdAssigner::apply(Module &module, const Features &features) { - stage.content.visit(*this); - NodeRemover().apply(stage, nodes_to_remove); -} - -void DeclarationCombiner::visit(Block &block) -{ - if(current_block) - return; - - TraversingVisitor::visit(block); -} - -void DeclarationCombiner::visit(VariableDeclaration &var) -{ - VariableDeclaration *&ptr = variables[var.name]; - if(ptr) - { - ptr->type = var.type; - if(var.init_expression) - ptr->init_expression = var.init_expression; - if(var.layout) - { - if(ptr->layout) - { - for(vector::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i) - { - bool found = false; - for(vector::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j) - if(j->name==i->name) - { - j->has_value = i->value; - j->value = i->value; - found = true; - } - - if(!found) - ptr->layout->qualifiers.push_back(*i); - } - } - else - ptr->layout = var.layout; - } - nodes_to_remove.insert(&var); - } - else - ptr = &var; -} - - -ConstantSpecializer::ConstantSpecializer(): - values(0) -{ } - -void ConstantSpecializer::apply(Stage &stage, const map *v) -{ - values = v; - stage.content.visit(*this); -} - -void ConstantSpecializer::visit(VariableDeclaration &var) -{ - bool specializable = false; - if(var.layout) - { - vector &qualifiers = var.layout->qualifiers; - for(vector::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i) - if(i->name=="constant_id") - { - specializable = true; - if(values) - qualifiers.erase(i); - else if(i->value==-1) - i->value = hash32(var.name)&0x7FFFFFFF; - break; - } - - if(qualifiers.empty()) - var.layout = 0; - } - - if(specializable && values) - { - map::const_iterator i = values->find(var.name); - if(i!=values->end()) - { - RefPtr literal = new Literal; - if(var.type=="bool") - { - literal->token = (i->second ? "true" : "false"); - literal->value = static_cast(i->second); - } - else if(var.type=="int") - { - literal->token = lexical_cast(i->second); - literal->value = i->second; - } - var.init_expression = literal; - } - } -} - - -void BlockHierarchyResolver::enter(Block &block) -{ - block.parent = current_block; -} + for(Stage &s: module.stages) + s.content.visit(*this); - -TypeResolver::TypeResolver(): - stage(0) -{ } - -void TypeResolver::apply(Stage &s) -{ - stage = &s; - s.types.clear(); - s.content.visit(*this); -} - -TypeDeclaration *TypeResolver::resolve_type(const string &name) -{ - map::iterator i = stage->types.find(name); - if(i!=stage->types.end()) + for(VariableDeclaration *v: auto_constants) { - map::iterator j = alias_map.find(i->second); - return (j!=alias_map.end() ? j->second : i->second); - } - else - return 0; -} - -void TypeResolver::visit(Block &block) -{ - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) - { - if(!block.parent) - type_insert_point = i; - (*i)->visit(*this); - } -} - -void TypeResolver::visit(BasicTypeDeclaration &type) -{ - type.base_type = resolve_type(type.base); - - if(type.kind==BasicTypeDeclaration::VECTOR && type.base_type) - if(BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type)) - if(basic_base->kind==BasicTypeDeclaration::VECTOR) - { - type.kind = BasicTypeDeclaration::MATRIX; - type.size |= basic_base->size<<16; - } + unsigned id = hash32(v->name)%features.constant_id_range; + while(used_ids.count(id)) + id = (id+1)%features.constant_id_range; - if(type.kind==BasicTypeDeclaration::ALIAS && type.base_type) - alias_map[&type] = type.base_type; - else if(type.kind==BasicTypeDeclaration::ARRAY && type.base_type) - array_types[type.base_type] = &type; + auto i = find_member(v->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name); + if(i!=v->layout->qualifiers.end()) + i->value = id; - stage->types.insert(make_pair(type.name, &type)); -} - -void TypeResolver::visit(ImageTypeDeclaration &type) -{ - type.base_type = resolve_type(type.base); - stage->types.insert(make_pair(type.name, &type)); -} - -void TypeResolver::visit(StructDeclaration &strct) -{ - stage->types.insert(make_pair(strct.name, &strct)); - TraversingVisitor::visit(strct); -} - -void TypeResolver::visit(VariableDeclaration &var) -{ - TypeDeclaration *type = resolve_type(var.type); - if(var.array && type) - { - map::iterator i = array_types.find(type); - if(i==array_types.end()) - { - BasicTypeDeclaration *array = new BasicTypeDeclaration; - array->source = BUILTIN_SOURCE; - array->name = type->name+"[]"; - array->kind = BasicTypeDeclaration::ARRAY; - array->base = type->name; - array->base_type = type; - stage->content.body.insert(type_insert_point, array); - array->visit(*this); - type = array; - } - else - type = i->second; + used_ids.insert(id); } - var.type_declaration = type; } -void TypeResolver::visit(FunctionDeclaration &func) +void ConstantIdAssigner::visit(VariableDeclaration &var) { - func.return_type_declaration = resolve_type(func.return_type); - TraversingVisitor::visit(func); -} - - -VariableResolver::VariableResolver(): - stage(0), - r_any_resolved(false), - record_target(false), - r_self_referencing(false), - r_assignment_target(0) -{ } - -bool VariableResolver::apply(Stage &s) -{ - stage = &s; - s.interface_blocks.clear(); - r_any_resolved = false; - s.content.visit(*this); - return r_any_resolved; -} - -void VariableResolver::enter(Block &block) -{ - block.variables.clear(); -} - -void VariableResolver::visit_and_replace(RefPtr &expr) -{ - r_replacement_expr = 0; - expr->visit(*this); - if(r_replacement_expr) - expr = r_replacement_expr; - r_replacement_expr = 0; -} - -void VariableResolver::visit(VariableReference &var) -{ - VariableDeclaration *declaration = 0; - - /* Look for variable declarations in the block hierarchy first. Interface - blocks are always defined in the top level so we can't accidentally skip - one. */ - for(Block *block=current_block; (!declaration && block); block=block->parent) - { - map::iterator i = block->variables.find(var.name); - if(i!=block->variables.end()) - declaration = i->second; - } - - if(!declaration) - { - const map &blocks = stage->interface_blocks; - map::const_iterator i = blocks.find("_"+var.name); - if(i!=blocks.end()) - { - /* The name refers to an interface block with an instance name rather - than a variable. Prepare a new syntax tree node accordingly. */ - InterfaceBlockReference *iface_ref = new InterfaceBlockReference; - iface_ref->source = var.source; - iface_ref->line = var.line; - iface_ref->name = var.name; - iface_ref->declaration = i->second; - r_replacement_expr = iface_ref; - } - else - { - // Look for the variable in anonymous interface blocks. - for(i=blocks.begin(); (!declaration && i!=blocks.end()); ++i) - if(i->second->instance_name.empty()) - { - map::iterator j = i->second->members.variables.find(var.name); - if(j!=i->second->members.variables.end()) - declaration = j->second; - } - } - } - - r_any_resolved |= (declaration!=var.declaration); - var.declaration = declaration; - - if(record_target) - { - if(r_assignment_target) - { - /* More than one variable reference found in assignment target. - Unable to determine what the primary target is. */ - record_target = false; - r_assignment_target = 0; - } - else - r_assignment_target = var.declaration; - } - else if(var.declaration && var.declaration==r_assignment_target) - r_self_referencing = true; -} - -void VariableResolver::visit(InterfaceBlockReference &iface) -{ - map::iterator i = stage->interface_blocks.find("_"+iface.name); - InterfaceBlock *declaration = (i!=stage->interface_blocks.end() ? i->second : 0); - r_any_resolved |= (declaration!=iface.declaration); - iface.declaration = declaration; -} - -void VariableResolver::visit(MemberAccess &memacc) -{ - visit_and_replace(memacc.left); - - map *members = 0; - if(StructDeclaration *strct = dynamic_cast(memacc.left->type)) - members = &strct->members.variables; - else if(InterfaceBlockReference *iface_ref = dynamic_cast(memacc.left.get())) - { - if(iface_ref->declaration) - members = &iface_ref->declaration->members.variables; - } - - VariableDeclaration *declaration = 0; - if(members) - { - map::iterator i = members->find(memacc.member); - if(i!=members->end()) - declaration = i->second; - } - - r_any_resolved |= (declaration!=memacc.declaration); - memacc.declaration = declaration; -} - -void VariableResolver::visit(UnaryExpression &unary) -{ - visit_and_replace(unary.expression); -} - -void VariableResolver::visit(BinaryExpression &binary) -{ - if(binary.oper->token[0]=='[') - { - { - /* The subscript expression is not a part of the primary assignment - target. */ - SetFlag set(record_target, false); - visit_and_replace(binary.right); - } - visit_and_replace(binary.left); - } - else - { - visit_and_replace(binary.left); - visit_and_replace(binary.right); - } -} - -void VariableResolver::visit(Assignment &assign) -{ - { - SetFlag set(record_target); - r_assignment_target = 0; - visit_and_replace(assign.left); - r_any_resolved |= (r_assignment_target!=assign.target_declaration); - assign.target_declaration = r_assignment_target; - } - - r_self_referencing = false; - visit_and_replace(assign.right); - assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='='); -} - -void VariableResolver::visit(FunctionCall &call) -{ - for(NodeArray::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i) - visit_and_replace(*i); -} - -void VariableResolver::visit(VariableDeclaration &var) -{ - if(!block_interface.empty() && var.interface.empty()) - var.interface = block_interface; - - TraversingVisitor::visit(var); - current_block->variables.insert(make_pair(var.name, &var)); -} - -void VariableResolver::visit(InterfaceBlock &iface) -{ - /* Block names can be reused in different interfaces. Prefix the name with - the first character of the interface to avoid conflicts. */ - stage->interface_blocks.insert(make_pair(iface.interface+iface.name, &iface)); - if(!iface.instance_name.empty()) - stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface)); - - SetForScope set_iface(block_interface, iface.interface); - TraversingVisitor::visit(iface); -} - - -ExpressionResolver::ExpressionResolver(): - stage(0), - r_any_resolved(false) -{ } - -bool ExpressionResolver::apply(Stage &s) -{ - stage = &s; - r_any_resolved = false; - s.content.visit(*this); - return r_any_resolved; -} - -bool ExpressionResolver::is_scalar(BasicTypeDeclaration &type) -{ - return (type.kind==BasicTypeDeclaration::INT || type.kind==BasicTypeDeclaration::FLOAT); -} - -bool ExpressionResolver::is_vector_or_matrix(BasicTypeDeclaration &type) -{ - return (type.kind==BasicTypeDeclaration::VECTOR || type.kind==BasicTypeDeclaration::MATRIX); -} - -BasicTypeDeclaration *ExpressionResolver::get_element_type(BasicTypeDeclaration &type) -{ - if(is_vector_or_matrix(type) || type.kind==BasicTypeDeclaration::ARRAY) - { - BasicTypeDeclaration *basic_base = dynamic_cast(type.base_type); - return (basic_base ? get_element_type(*basic_base) : 0); - } - else - return &type; -} - -bool ExpressionResolver::can_convert(BasicTypeDeclaration &from, BasicTypeDeclaration &to) -{ - if(from.kind==BasicTypeDeclaration::INT && to.kind==BasicTypeDeclaration::FLOAT) - return from.size<=to.size; - else if(from.kind!=to.kind) - return false; - else if((from.kind==BasicTypeDeclaration::VECTOR || from.kind==BasicTypeDeclaration::MATRIX) && from.size==to.size) - { - BasicTypeDeclaration *from_base = dynamic_cast(from.base_type); - BasicTypeDeclaration *to_base = dynamic_cast(to.base_type); - return (from_base && to_base && can_convert(*from_base, *to_base)); - } - else - return false; -} - -ExpressionResolver::Compatibility ExpressionResolver::get_compatibility(BasicTypeDeclaration &left, BasicTypeDeclaration &right) -{ - if(&left==&right) - return SAME_TYPE; - else if(can_convert(left, right)) - return LEFT_CONVERTIBLE; - else if(can_convert(right, left)) - return RIGHT_CONVERTIBLE; - else - return NOT_COMPATIBLE; -} - -BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration::Kind kind, unsigned size) -{ - for(vector::const_iterator i=basic_types.begin(); i!=basic_types.end(); ++i) - if((*i)->kind==kind && (*i)->size==size) - return *i; - return 0; -} - -BasicTypeDeclaration *ExpressionResolver::find_type(BasicTypeDeclaration &elem_type, BasicTypeDeclaration::Kind kind, unsigned size) -{ - for(vector::const_iterator i=basic_types.begin(); i!=basic_types.end(); ++i) - if(get_element_type(**i)==&elem_type && (*i)->kind==kind && (*i)->size==size) - return *i; - return 0; -} - -void ExpressionResolver::convert_to(RefPtr &expr, BasicTypeDeclaration &type) -{ - RefPtr call = new FunctionCall; - call->name = type.name; - call->constructor = true; - call->arguments.push_back(0); - call->arguments.back() = expr; - call->type = &type; - expr = call; -} - -bool ExpressionResolver::convert_to_element(RefPtr &expr, BasicTypeDeclaration &elem_type) -{ - if(BasicTypeDeclaration *expr_type = dynamic_cast(expr->type)) - { - BasicTypeDeclaration *to_type = &elem_type; - if(is_vector_or_matrix(*expr_type)) - to_type = find_type(elem_type, expr_type->kind, expr_type->size); - if(to_type) - { - convert_to(expr, *to_type); - return true; - } - } - - return false; -} - -void ExpressionResolver::resolve(Expression &expr, TypeDeclaration *type, bool lvalue) -{ - r_any_resolved |= (type!=expr.type || lvalue!=expr.lvalue); - expr.type = type; - expr.lvalue = lvalue; -} - -void ExpressionResolver::visit(Literal &literal) -{ - if(literal.value.check_type()) - resolve(literal, find_type(BasicTypeDeclaration::BOOL, 1), false); - else if(literal.value.check_type()) - resolve(literal, find_type(BasicTypeDeclaration::INT, 32), false); - else if(literal.value.check_type()) - resolve(literal, find_type(BasicTypeDeclaration::FLOAT, 32), false); -} - -void ExpressionResolver::visit(ParenthesizedExpression &parexpr) -{ - TraversingVisitor::visit(parexpr); - resolve(parexpr, parexpr.expression->type, parexpr.expression->lvalue); -} - -void ExpressionResolver::visit(VariableReference &var) -{ - if(var.declaration) - resolve(var, var.declaration->type_declaration, true); -} - -void ExpressionResolver::visit(InterfaceBlockReference &iface) -{ - resolve(iface, 0, true); -} - -void ExpressionResolver::visit(MemberAccess &memacc) -{ - TraversingVisitor::visit(memacc); - - if(memacc.declaration) - resolve(memacc, memacc.declaration->type_declaration, memacc.left->lvalue); -} - -void ExpressionResolver::visit(UnaryExpression &unary) -{ - TraversingVisitor::visit(unary); - - BasicTypeDeclaration *basic = dynamic_cast(unary.expression->type); - if(!basic) - return; - - char oper = unary.oper->token[0]; - if(oper=='!') - { - if(basic->kind!=BasicTypeDeclaration::BOOL) - return; - } - else if(oper=='~') - { - if(basic->kind!=BasicTypeDeclaration::INT) - return; - } - else if(oper=='+' || oper=='-') - { - BasicTypeDeclaration *elem = get_element_type(*basic); - if(!elem || !is_scalar(*elem)) - return; - } - resolve(unary, basic, unary.expression->lvalue); -} - -void ExpressionResolver::visit(BinaryExpression &binary, bool assign) -{ - /* Binary operators are only defined for basic types (not for image or - structure types). */ - BasicTypeDeclaration *basic_left = dynamic_cast(binary.left->type); - BasicTypeDeclaration *basic_right = dynamic_cast(binary.right->type); - if(!basic_left || !basic_right) - return; - - char oper = binary.oper->token[0]; - if(oper=='[') - { - /* Subscripting operates on vectors, matrices and arrays, and the right - operand must be an integer. */ - if((!is_vector_or_matrix(*basic_left) && basic_left->kind!=BasicTypeDeclaration::ARRAY) || basic_right->kind!=BasicTypeDeclaration::INT) - return; - - resolve(binary, basic_left->base_type, binary.left->lvalue); - return; - } - else if(basic_left->kind==BasicTypeDeclaration::ARRAY || basic_right->kind==BasicTypeDeclaration::ARRAY) - // No other binary operator can be used with arrays. - return; - - BasicTypeDeclaration *elem_left = get_element_type(*basic_left); - BasicTypeDeclaration *elem_right = get_element_type(*basic_right); - if(!elem_left || !elem_right) - return; - - Compatibility compat = get_compatibility(*basic_left, *basic_right); - Compatibility elem_compat = get_compatibility(*elem_left, *elem_right); - if(elem_compat==NOT_COMPATIBLE) - return; - if(assign && (compat==LEFT_CONVERTIBLE || elem_compat==LEFT_CONVERTIBLE)) - return; - - TypeDeclaration *type = 0; - char oper2 = binary.oper->token[1]; - if((oper=='<' && oper2!='<') || (oper=='>' && oper2!='>')) - { - /* Relational operators compare two scalar integer or floating-point - values. */ - if(!is_scalar(*elem_left) || !is_scalar(*elem_right) || compat==NOT_COMPATIBLE) - return; - - type = find_type(BasicTypeDeclaration::BOOL, 1); - } - else if((oper=='=' || oper=='!') && oper2=='=') - { - // Equality comparison can be done on any compatible types. - if(compat==NOT_COMPATIBLE) - return; - - type = find_type(BasicTypeDeclaration::BOOL, 1); - } - else if(oper2=='&' || oper2=='|' || oper2=='^') - { - // Logical operators can only be applied to booleans. - if(basic_left->kind!=BasicTypeDeclaration::BOOL || basic_right->kind!=BasicTypeDeclaration::BOOL) - return; - - type = basic_left; - } - else if((oper=='&' || oper=='|' || oper=='^' || oper=='%') && !oper2) - { - // Bitwise operators and modulo can only be applied to integers. - if(basic_left->kind!=BasicTypeDeclaration::INT || basic_right->kind!=BasicTypeDeclaration::INT) - return; - - type = (compat==LEFT_CONVERTIBLE ? basic_right : basic_left); - } - else if((oper=='<' || oper=='>') && oper2==oper) - { - // Shifts apply to integer scalars and vectors, with some restrictions. - if(elem_left->kind!=BasicTypeDeclaration::INT || elem_right->kind!=BasicTypeDeclaration::INT) - return; - unsigned left_size = (basic_left->kind==BasicTypeDeclaration::INT ? 1 : basic_left->kind==BasicTypeDeclaration::VECTOR ? basic_left->size : 0); - unsigned right_size = (basic_right->kind==BasicTypeDeclaration::INT ? 1 : basic_right->kind==BasicTypeDeclaration::VECTOR ? basic_right->size : 0); - if(!left_size || (left_size==1 && right_size!=1) || (left_size>1 && right_size!=1 && right_size!=left_size)) - return; - - type = basic_left; - // Don't perform conversion even if the operands are of different sizes. - compat = SAME_TYPE; - } - else if(oper=='+' || oper=='-' || oper=='*' || oper=='/') + if(var.layout) { - // Arithmetic operators require scalar elements. - if(!is_scalar(*elem_left) || !is_scalar(*elem_right)) - return; - - if(oper=='*' && is_vector_or_matrix(*basic_left) && is_vector_or_matrix(*basic_right) && - (basic_left->kind==BasicTypeDeclaration::MATRIX || basic_right->kind==BasicTypeDeclaration::MATRIX)) - { - /* Multiplication has special rules when at least one operand is a - matrix and the other is a vector or a matrix. */ - unsigned left_columns = basic_left->size&0xFFFF; - unsigned right_rows = basic_right->size; - if(basic_right->kind==BasicTypeDeclaration::MATRIX) - right_rows >>= 16; - if(left_columns!=right_rows) - return; - - BasicTypeDeclaration *elem_result = (elem_compat==LEFT_CONVERTIBLE ? elem_right : elem_left); - - if(basic_left->kind==BasicTypeDeclaration::VECTOR) - type = find_type(*elem_result, BasicTypeDeclaration::VECTOR, basic_right->size&0xFFFF); - else if(basic_right->kind==BasicTypeDeclaration::VECTOR) - type = find_type(*elem_result, BasicTypeDeclaration::VECTOR, basic_left->size>>16); - else - type = find_type(*elem_result, BasicTypeDeclaration::MATRIX, (basic_left->size&0xFFFF0000)|(basic_right->size&0xFFFF)); - } - else if(compat==NOT_COMPATIBLE) + auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name); + if(i!=var.layout->qualifiers.end() && i->has_value) { - // Arithmetic between scalars and matrices or vectors is supported. - if(is_scalar(*basic_left) && is_vector_or_matrix(*basic_right)) - type = (elem_compat==RIGHT_CONVERTIBLE ? find_type(*elem_left, basic_right->kind, basic_right->size) : basic_right); - else if(is_vector_or_matrix(*basic_left) && is_scalar(*basic_right)) - type = (elem_compat==LEFT_CONVERTIBLE ? find_type(*elem_right, basic_left->kind, basic_left->size) : basic_left); + if(i->value==-1) + auto_constants.push_back(&var); else - return; + used_ids.insert(i->value); } - else if(compat==LEFT_CONVERTIBLE) - type = basic_right; - else - type = basic_left; } - else - return; - - if(assign && type!=basic_left) - return; - - bool converted = true; - if(compat==LEFT_CONVERTIBLE) - convert_to(binary.left, *basic_right); - else if(compat==RIGHT_CONVERTIBLE) - convert_to(binary.right, *basic_left); - else if(elem_compat==LEFT_CONVERTIBLE) - converted = convert_to_element(binary.left, *elem_right); - else if(elem_compat==RIGHT_CONVERTIBLE) - converted = convert_to_element(binary.right, *elem_left); - - if(!converted) - type = 0; - - resolve(binary, type, assign); -} - -void ExpressionResolver::visit(BinaryExpression &binary) -{ - TraversingVisitor::visit(binary); - visit(binary, false); -} - -void ExpressionResolver::visit(Assignment &assign) -{ - TraversingVisitor::visit(assign); - - if(assign.oper->token[0]!='=') - return visit(assign, true); - else if(assign.left->type!=assign.right->type) - { - BasicTypeDeclaration *basic_left = dynamic_cast(assign.left->type); - BasicTypeDeclaration *basic_right = dynamic_cast(assign.right->type); - if(!basic_left || !basic_right) - return; - - Compatibility compat = get_compatibility(*basic_left, *basic_right); - if(compat==RIGHT_CONVERTIBLE) - convert_to(assign.right, *basic_left); - else if(compat!=SAME_TYPE) - return; - } - - resolve(assign, assign.left->type, true); -} - -void ExpressionResolver::visit(FunctionCall &call) -{ - TraversingVisitor::visit(call); - - TypeDeclaration *type = 0; - if(call.declaration) - type = call.declaration->return_type_declaration; - else if(call.constructor) - { - map::const_iterator i=stage->types.find(call.name); - type = (i!=stage->types.end() ? i->second : 0); - } - resolve(call, type, false); -} - -void ExpressionResolver::visit(BasicTypeDeclaration &type) -{ - basic_types.push_back(&type); -} - -void ExpressionResolver::visit(VariableDeclaration &var) -{ - TraversingVisitor::visit(var); - if(!var.init_expression) - return; - - BasicTypeDeclaration *var_basic = dynamic_cast(var.type_declaration); - BasicTypeDeclaration *init_basic = dynamic_cast(var.init_expression->type); - if(!var_basic || !init_basic) - return; - - Compatibility compat = get_compatibility(*var_basic, *init_basic); - if(compat==RIGHT_CONVERTIBLE) - convert_to(var.init_expression, *var_basic); } -void FunctionResolver::apply(Stage &s) -{ - stage = &s; - s.functions.clear(); - s.content.visit(*this); -} - -void FunctionResolver::visit(FunctionCall &call) -{ - map::iterator i = stage->functions.find(call.name); - if(i!=stage->functions.end()) - call.declaration = i->second; - - TraversingVisitor::visit(call); -} - -void FunctionResolver::visit(FunctionDeclaration &func) -{ - FunctionDeclaration *&stage_decl = stage->functions[func.name]; - vector &decls = declarations[func.name]; - if(func.definition==&func) - { - stage_decl = &func; - - // Set all previous declarations to use this definition. - for(vector::iterator i=decls.begin(); i!=decls.end(); ++i) - { - (*i)->definition = func.definition; - (*i)->body.body.clear(); - } - } - else - { - func.definition = 0; - if(!stage_decl) - stage_decl = &func; - else - func.definition = stage_decl->definition; - } - decls.push_back(&func); - - TraversingVisitor::visit(func); -} - - -InterfaceGenerator::InterfaceGenerator(): - stage(0), - function_scope(false), - iface_block(0), - copy_block(false), - iface_target_block(0) -{ } - string InterfaceGenerator::get_out_prefix(Stage::Type type) { if(type==Stage::VERTEX) @@ -876,7 +68,7 @@ void InterfaceGenerator::apply(Stage &s) void InterfaceGenerator::visit(Block &block) { SetForScope set_block(current_block, &block); - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) + for(auto i=block.body.begin(); i!=block.body.end(); ++i) { assignment_insert_point = i; if(&block==&stage->content) @@ -897,6 +89,9 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration if(stage->content.variables.count(name)) return 0; + if(stage->type==Stage::GEOMETRY && !copy_block && var.interface=="out" && var.array) + return 0; + VariableDeclaration* iface_var = new VariableDeclaration; iface_var->sampling = var.sampling; iface_var->interface = iface; @@ -919,18 +114,21 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration iface_target_block->body.insert(iface_insert_point, iface_var); iface_target_block->variables.insert(make_pair(name, iface_var)); + if(iface_target_block==&stage->content && iface=="in") + declared_inputs.push_back(iface_var); return iface_var; } InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block) { - if(stage->interface_blocks.count("in"+out_block.name)) + if(stage->interface_blocks.count("in "+out_block.block_name)) return 0; InterfaceBlock *in_block = new InterfaceBlock; in_block->interface = "in"; - in_block->name = out_block.name; + in_block->block_name = out_block.block_name; + in_block->members = new Block; in_block->instance_name = out_block.instance_name; if(stage->type==Stage::GEOMETRY) in_block->array = true; @@ -941,15 +139,18 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block { SetFlag set_copy(copy_block, true); - SetForScope set_target(iface_target_block, &in_block->members); - SetForScope::iterator> set_ins_pt(iface_insert_point, in_block->members.body.end()); - out_block.members.visit(*this); + SetForScope set_target(iface_target_block, in_block->members.get()); + SetForScope::iterator> set_ins_pt(iface_insert_point, in_block->members->body.end()); + if(out_block.struct_declaration) + out_block.struct_declaration->members.visit(*this); + else if(out_block.members) + out_block.members->visit(*this); } iface_target_block->body.insert(iface_insert_point, in_block); - stage->interface_blocks.insert(make_pair("in"+in_block->name, in_block)); + stage->interface_blocks.insert(make_pair("in "+in_block->block_name, in_block)); if(!in_block->instance_name.empty()) - stage->interface_blocks.insert(make_pair("_"+in_block->instance_name, in_block)); + stage->interface_blocks.insert(make_pair(in_block->instance_name, in_block)); SetFlag set_scope(function_scope, false); SetForScope set_block(current_block, &stage->content); @@ -985,18 +186,24 @@ void InterfaceGenerator::visit(VariableReference &var) return; const map &prev_vars = stage->previous->content.variables; - map::const_iterator i = prev_vars.find(var.name); + auto i = prev_vars.find(var.name); if(i==prev_vars.end() || i->second->interface!="out") i = prev_vars.find(in_prefix+var.name); if(i!=prev_vars.end() && i->second->interface=="out") { - generate_interface(*i->second, "in", i->second->name); - var.name = i->second->name; + if(stage->type==Stage::GEOMETRY && i->second->array) + stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line, + format("Can't access '%s' through automatic interface because it's an array", var.name))); + else + { + generate_interface(*i->second, "in", i->second->name); + var.name = i->second->name; + } return; } const map &prev_blocks = stage->previous->interface_blocks; - map::const_iterator j = prev_blocks.find("_"+var.name); + auto j = prev_blocks.find(var.name); if(j!=prev_blocks.end() && j->second->interface=="out") { generate_interface(*j->second); @@ -1005,13 +212,14 @@ void InterfaceGenerator::visit(VariableReference &var) return; } - for(j=prev_blocks.begin(); j!=prev_blocks.end(); ++j) - if(j->second->instance_name.empty()) + for(const auto &kvp: prev_blocks) + if(kvp.second->instance_name.empty() && kvp.second->struct_declaration) { - i = j->second->members.variables.find(var.name); - if(i!=j->second->members.variables.end()) + const map &iface_vars = kvp.second->struct_declaration->members.variables; + i = iface_vars.find(var.name); + if(i!=iface_vars.end()) { - generate_interface(*j->second); + generate_interface(*kvp.second); return; } } @@ -1020,28 +228,8 @@ void InterfaceGenerator::visit(VariableReference &var) void InterfaceGenerator::visit(VariableDeclaration &var) { if(copy_block) - { generate_interface(var, "in", var.name); - return; - } - - if(iface_block) - { - if(iface_block->linked_block) - { - // Link all variables to their counterparts in the linked block. - const map &linked_vars = iface_block->linked_block->members.variables; - map::const_iterator i = linked_vars.find(var.name); - if(i!=linked_vars.end()) - { - var.linked_declaration = i->second; - var.linked_declaration->linked_declaration = &var; - } - } - return; - } - - if(var.interface=="out") + else if(var.interface=="out") { /* For output variables in function scope, generate a global interface and replace the local declaration with an assignment. */ @@ -1060,14 +248,17 @@ void InterfaceGenerator::visit(VariableDeclaration &var) } } } - else if(var.interface=="in") + else if(var.interface=="in" && current_block==&stage->content) { + if(var.name.compare(0, 3, "gl_")) + declared_inputs.push_back(&var); + /* Try to link input variables in global scope with output variables from previous stage. */ - if(current_block==&stage->content && !var.linked_declaration && stage->previous) + if(!var.linked_declaration && stage->previous) { const map &prev_vars = stage->previous->content.variables; - map::const_iterator i = prev_vars.find(var.name); + auto i = prev_vars.find(var.name); if(i!=prev_vars.end() && i->second->interface=="out") { var.linked_declaration = i->second; @@ -1088,7 +279,7 @@ void InterfaceGenerator::visit(InterfaceBlock &iface) if(!iface.linked_block && stage->previous) { const map &prev_blocks = stage->previous->interface_blocks; - map::const_iterator i = prev_blocks.find("out"+iface.name); + auto i = prev_blocks.find("out "+iface.block_name); if(i!=prev_blocks.end()) { iface.linked_block = i->second; @@ -1097,7 +288,6 @@ void InterfaceGenerator::visit(InterfaceBlock &iface) } } - SetForScope set_iface(iface_block, &iface); TraversingVisitor::visit(iface); } @@ -1110,25 +300,20 @@ void InterfaceGenerator::visit(FunctionDeclaration &func) void InterfaceGenerator::visit(Passthrough &pass) { - vector pass_vars; - - // Pass through all input variables of this stage. - for(map::const_iterator i=stage->content.variables.begin(); i!=stage->content.variables.end(); ++i) - if(i->second->interface=="in") - pass_vars.push_back(i->second); + // Pass through all input variables declared so far. + vector pass_vars = declared_inputs; if(stage->previous) { - const map &prev_vars = stage->previous->content.variables; - for(map::const_iterator i=prev_vars.begin(); i!=prev_vars.end(); ++i) + for(const auto &kvp: stage->previous->content.variables) { - if(i->second->interface!="out") + if(kvp.second->interface!="out") continue; /* Pass through output variables from the previous stage, but only those which are not already linked to an input here. */ - if(!i->second->linked_declaration && generate_interface(*i->second, "in", i->second->name)) - pass_vars.push_back(i->second); + if(!kvp.second->linked_declaration && generate_interface(*kvp.second, "in", kvp.second->name)) + pass_vars.push_back(kvp.second); } } @@ -1151,13 +336,13 @@ void InterfaceGenerator::visit(Passthrough &pass) insert_assignment("gl_Position", memacc); } - for(vector::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i) + for(VariableDeclaration *v: pass_vars) { - string out_name = change_prefix((*i)->name, out_prefix); - generate_interface(**i, "out", out_name); + string out_name = change_prefix(v->name, out_prefix); + generate_interface(*v, "out", out_name); VariableReference *ref = new VariableReference; - ref->name = (*i)->name; + ref->name = v->name; if(pass.subscript) { BinaryExpression *subscript = new BinaryExpression;