X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=406d7780e810181ffc8650e9c0ba8c20466d67aa;hp=f72dedfd2aa006fe71409fad62c559908be118bd;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=17074650100dd51362f6075eca81e18748808a63 diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp index f72dedfd..406d7780 100644 --- a/source/glsl/resolve.cpp +++ b/source/glsl/resolve.cpp @@ -390,6 +390,21 @@ void VariableResolver::merge_layouts(Layout &to_layout, const Layout &from_layou } } +void VariableResolver::redeclare_builtin(VariableDeclaration &existing, VariableDeclaration &var) +{ + if(var.layout) + { + if(existing.layout) + merge_layouts(*existing.layout, *var.layout); + else + existing.layout = var.layout; + } + if(var.array_size) + existing.array_size = var.array_size; + + redeclared_builtins.push_back(&existing); +} + void VariableResolver::visit(VariableDeclaration &var) { TraversingVisitor::visit(var); @@ -422,17 +437,8 @@ void VariableResolver::visit(VariableDeclaration &var) { if(existing->source==BUILTIN_SOURCE) { - if(var.layout) - { - if(existing->layout) - merge_layouts(*existing->layout, *var.layout); - else - existing->layout = var.layout; - } - if(var.array_size) - existing->array_size = var.array_size; + redeclare_builtin(*existing, var); - redeclared_builtins.push_back(existing); if(block) { redeclared_builtins.push_back(block); @@ -454,11 +460,41 @@ void VariableResolver::visit(VariableDeclaration &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(format("%s %s", iface.interface, iface.block_name), &iface)); - if(!iface.instance_name.empty()) - stage->interface_blocks.insert(make_pair(iface.instance_name, &iface)); + string key = format("%s %s", iface.interface, iface.block_name); + auto i = stage->interface_blocks.find(key); + if(i!=stage->interface_blocks.end()) + { + if(i->second->source==BUILTIN_SOURCE && iface.struct_declaration && i->second->struct_declaration) + { + const map &vars = iface.struct_declaration->members.variables; + const map &existing_vars = i->second->struct_declaration->members.variables; + + bool found_all = true; + for(const auto &kvp: vars) + { + auto j = existing_vars.find(kvp.first); + if(j!=existing_vars.end() && j->second->type==kvp.second->type && j->second->array==kvp.second->array) + redeclare_builtin(*j->second, *kvp.second); + else + found_all = false; + } + + if(found_all) + { + redeclared_builtins.push_back(i->second); + nodes_to_remove.insert(&iface); + nodes_to_remove.insert(iface.struct_declaration); + } + } + } + else + { + /* Block names can be reused in different interfaces. Prepend the interface + to the name to avoid conflicts. */ + stage->interface_blocks.insert(make_pair(key, &iface)); + if(!iface.instance_name.empty()) + stage->interface_blocks.insert(make_pair(iface.instance_name, &iface)); + } TraversingVisitor::visit(iface); } @@ -936,6 +972,11 @@ void ExpressionResolver::visit_constructor(FunctionCall &call) { unsigned column_count = basic->size&0xFFFF; unsigned row_count = basic->size>>16; + + vector > columns; + columns.reserve(column_count); + bool changed_columns = false; + if(call.arguments.size()==1) { /* A matrix can be constructed from a single element or another @@ -958,8 +999,6 @@ void ExpressionResolver::visit_constructor(FunctionCall &call) current_block->body.insert(insert_point, temporary); // Create expressions to build each column. - vector > columns; - columns.reserve(column_count); for(unsigned j=0; j ref = new VariableReference; @@ -980,13 +1019,7 @@ void ExpressionResolver::visit_constructor(FunctionCall &call) truncate_vector(columns.back(), row_count); } - call.arguments.resize(column_count); - copy(columns.begin(), columns.end(), call.arguments.begin()); - - /* Let VariableResolver process the new nodes and finish - resolving the constructor on the next pass. */ - r_any_resolved = true; - return; + changed_columns = true; } else return; @@ -995,9 +1028,6 @@ void ExpressionResolver::visit_constructor(FunctionCall &call) { /* Construct a matrix from individual components in column-major order. Arguments must align at column boundaries. */ - vector > columns; - columns.reserve(column_count); - vector > column_args; column_args.reserve(row_count); unsigned column_component_count = 0; @@ -1031,11 +1061,24 @@ void ExpressionResolver::visit_constructor(FunctionCall &call) else if(column_component_count>row_count) // Argument alignment mismatch. return; + + changed_columns = true; } } } else return; + + if(changed_columns) + { + call.arguments.resize(column_count); + copy(columns.begin(), columns.end(), call.arguments.begin()); + + /* Let VariableResolver process the new nodes and finish + resolving the constructor on the next pass. */ + r_any_resolved = true; + return; + } } else return; @@ -1105,6 +1148,28 @@ void ExpressionResolver::visit(VariableDeclaration &var) convert_to(var.init_expression, *var_basic); } +void ExpressionResolver::visit(FunctionDeclaration &func) +{ + SetForScope set_func(current_function, &func); + TraversingVisitor::visit(func); +} + +void ExpressionResolver::visit(Return &ret) +{ + TraversingVisitor::visit(ret); + if(!current_function || !ret.expression) + return; + + BasicTypeDeclaration *ret_basic = dynamic_cast(current_function->return_type_declaration); + BasicTypeDeclaration *expr_basic = dynamic_cast(ret.expression->type); + if(!ret_basic || !expr_basic) + return; + + Compatibility compat = get_compatibility(*ret_basic, *expr_basic); + if(compat==RIGHT_CONVERTIBLE) + convert_to(ret.expression, *ret_basic); +} + bool FunctionResolver::apply(Stage &s) {