X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=2f3192d77fa423a2f8fa3fb6587d283eec9da5a0;hb=0585e361d8714ac4efc3ae3e1d5c8c9aa8841c34;hp=c12a0f48cd389997a95da283b0bd583b6867729f;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp index c12a0f48..2f3192d7 100644 --- a/source/glsl/resolve.cpp +++ b/source/glsl/resolve.cpp @@ -17,12 +17,6 @@ void BlockHierarchyResolver::enter(Block &block) } -TypeResolver::TypeResolver(): - stage(0), - iface_block(0), - r_any_resolved(false) -{ } - bool TypeResolver::apply(Stage &s) { stage = &s; @@ -34,7 +28,9 @@ bool TypeResolver::apply(Stage &s) TypeDeclaration *TypeResolver::get_or_create_array_type(TypeDeclaration &type) { - auto i = array_types.find(&type); + bool extended_alignment = iface_block; + auto key = make_pair(&type, extended_alignment); + auto i = array_types.find(key); if(i!=array_types.end()) return i->second; @@ -42,10 +38,11 @@ TypeDeclaration *TypeResolver::get_or_create_array_type(TypeDeclaration &type) array->source = INTERNAL_SOURCE; array->name = type.name+"[]"; array->kind = BasicTypeDeclaration::ARRAY; + array->extended_alignment = extended_alignment; array->base = type.name; array->base_type = &type; stage->content.body.insert(type_insert_point, array); - array_types[&type] = array; + array_types[key] = array; return array; } @@ -94,7 +91,7 @@ void TypeResolver::visit(BasicTypeDeclaration &type) 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; + array_types[make_pair(type.base_type, type.extended_alignment)] = &type; stage->types.insert(make_pair(type.name, &type)); } @@ -108,14 +105,20 @@ void TypeResolver::visit(ImageTypeDeclaration &type) void TypeResolver::visit(StructDeclaration &strct) { stage->types.insert(make_pair(strct.name, &strct)); + SetForScope set_iface(iface_block, strct.interface_block); TraversingVisitor::visit(strct); } void TypeResolver::visit(VariableDeclaration &var) { resolve_type(var.type_declaration, var.type, var.array); - if(iface_block && var.interface==iface_block->interface) - var.interface.clear(); + if(iface_block) + { + if(var.interface==iface_block->interface) + var.interface.clear(); + if(StructDeclaration *strct = dynamic_cast(var.type_declaration)) + strct->extended_alignment = true; + } } void TypeResolver::visit(InterfaceBlock &iface) @@ -129,6 +132,7 @@ void TypeResolver::visit(InterfaceBlock &iface) strct->source = INTERNAL_SOURCE; strct->name = format("_%s_%s", iface.interface, iface.block_name); strct->members.body.splice(strct->members.body.begin(), iface.members->body); + strct->extended_alignment = true; stage->content.body.insert(type_insert_point, strct); stage->types.insert(make_pair(strct->name, strct)); @@ -151,21 +155,14 @@ void TypeResolver::visit(FunctionDeclaration &func) } -VariableResolver::VariableResolver(): - stage(0), - r_any_resolved(false), - record_target(false), - r_self_referencing(false) -{ } - bool VariableResolver::apply(Stage &s) { stage = &s; s.interface_blocks.clear(); r_any_resolved = false; s.content.visit(*this); - for(VariableDeclaration *v: redeclared_builtins) - v->source = GENERATED_SOURCE; + for(Statement *b: redeclared_builtins) + b->source = GENERATED_SOURCE; NodeRemover().apply(s, nodes_to_remove); return r_any_resolved; } @@ -311,7 +308,7 @@ void VariableResolver::visit(MemberAccess &memacc) static const char component_names[] = { 'x', 'r', 's', 'y', 'g', 't', 'z', 'b', 'p', 'w', 'a', 'q' }; bool ok = true; - UInt8 components[4] = { }; + uint8_t components[4] = { }; for(unsigned i=0; (ok && ivariables[var.name]; - if(!ptr) - ptr = &var; - else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type) + + auto i = current_block->variables.find(var.name); + VariableDeclaration *existing = 0; + InterfaceBlock *block = 0; + if(i!=current_block->variables.end()) + existing = i->second; + else if(!current_block->parent) { - if(ptr->source==BUILTIN_SOURCE) - redeclared_builtins.push_back(&var); - else - stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line, - format("Redeclaring non-builtin variable '%s' is deprecated", var.name))); + const map &blocks = stage->interface_blocks; + for(auto j=blocks.begin(); j!=blocks.end(); ++j) + if(j->second->instance_name.empty() && j->second->struct_declaration) + { + map &block_vars = j->second->struct_declaration->members.variables; + i = block_vars.find(var.name); + if(i!=block_vars.end()) + { + existing = i->second; + block = j->second; + break; + } + } + } - if(var.init_expression) - ptr->init_expression = var.init_expression; - if(var.layout) + if(!existing) + current_block->variables.insert(make_pair(var.name, &var)); + else if(!current_block->parent && (block ? block->interface : existing->interface)==var.interface && existing->type==var.type && existing->array==var.array) + { + if(existing->source==BUILTIN_SOURCE) { - if(ptr->layout) - merge_layouts(*ptr->layout, *var.layout); - else - ptr->layout = var.layout; - } - nodes_to_remove.insert(&var); + redeclare_builtin(*existing, var); - r_any_resolved = true; + if(block) + { + redeclared_builtins.push_back(block); + for(const auto &kvp: block->struct_declaration->members.variables) + redeclared_builtins.push_back(kvp.second); + } + + nodes_to_remove.insert(&var); + r_any_resolved = true; + } + else if(existing->array && !existing->array_size && !var.layout && !var.init_expression) + { + existing->array_size = var.array_size; + nodes_to_remove.insert(&var); + r_any_resolved = true; + } } } 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); } -ExpressionResolver::ExpressionResolver(): - stage(0), - r_any_resolved(false) -{ } - bool ExpressionResolver::apply(Stage &s) { stage = &s; @@ -921,6 +982,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 @@ -943,8 +1009,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; @@ -965,13 +1029,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; @@ -980,9 +1038,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; @@ -1016,11 +1071,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; @@ -1090,6 +1158,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) {