X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=f5b6b7adb91769277f95de93d56d605e38cc88f7;hb=5f6ee612cb83029de9559bae644c9a3b4e579259;hp=71b35b2c59f3ef8217db37d32b93123da763d047;hpb=ef44eaf157a448938267ff707a3dbfeb1a87636f;p=libs%2Fgl.git diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index 71b35b2c..f5b6b7ad 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -114,6 +114,71 @@ void BlockHierarchyResolver::enter(Block &block) } +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()) + { + map::iterator j = alias_map.find(i->second); + return (j!=alias_map.end() ? j->second : i->second); + } + else + return 0; +} + +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; + } + + if(type.kind==BasicTypeDeclaration::ALIAS && type.base_type) + alias_map[&type] = type.base_type; + + 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) +{ + var.type_declaration = resolve_type(var.type); +} + +void TypeResolver::visit(FunctionDeclaration &func) +{ + func.return_type_declaration = resolve_type(func.return_type); + TraversingVisitor::visit(func); +} + + VariableResolver::VariableResolver(): stage(0), r_members(0), @@ -125,7 +190,6 @@ VariableResolver::VariableResolver(): void VariableResolver::apply(Stage &s) { stage = &s; - s.types.clear(); s.interface_blocks.clear(); s.content.visit(*this); } @@ -149,20 +213,17 @@ void VariableResolver::visit(VariableReference &var) var.declaration = i->second; } - if(var.declaration) - { - if(var.declaration->type_declaration) - r_members = &var.declaration->type_declaration->members.variables; - } - else + if(!var.declaration) { const map &blocks = stage->interface_blocks; - map::const_iterator i = blocks.find(var.name); - if(i!=blocks.end() && i->second->instance_name==var.name) + 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. */ r_iface_ref = new InterfaceBlockReference; + r_iface_ref->source = var.source; + r_iface_ref->line = var.line; r_iface_ref->name = var.name; r_iface_ref->declaration = i->second; r_members = &i->second->members.variables; @@ -180,6 +241,10 @@ void VariableResolver::visit(VariableReference &var) } } + if(var.declaration) + if(StructDeclaration *strct = dynamic_cast(var.declaration->type_declaration)) + r_members = &strct->members.variables; + if(record_target) { if(r_assignment_target) @@ -201,7 +266,7 @@ void VariableResolver::visit(InterfaceBlockReference &iface) iface.declaration = 0; for(Block *block=current_block; block; block=block->parent) { - map::iterator i = stage->interface_blocks.find(iface.name); + map::iterator i = stage->interface_blocks.find("_"+iface.name); if(i!=stage->interface_blocks.end()) { iface.declaration = i->second; @@ -228,8 +293,8 @@ void VariableResolver::visit(MemberAccess &memacc) if(i!=r_members->end()) { memacc.declaration = i->second; - if(i->second->type_declaration) - r_members = &i->second->type_declaration->members.variables; + if(StructDeclaration *strct = dynamic_cast(i->second->type_declaration)) + r_members = &strct->members.variables; } else r_members = 0; @@ -292,32 +357,22 @@ void VariableResolver::visit(FunctionCall &call) r_iface_ref = 0; } -void VariableResolver::visit(StructDeclaration &strct) -{ - TraversingVisitor::visit(strct); - stage->types[strct.name] = &strct; -} - void VariableResolver::visit(VariableDeclaration &var) { - map::iterator i = stage->types.find(var.type); - if(i!=stage->types.end()) - var.type_declaration = i->second; - if(!block_interface.empty() && var.interface.empty()) var.interface = block_interface; TraversingVisitor::visit(var); - current_block->variables[var.name] = &var; + current_block->variables.insert(make_pair(var.name, &var)); } void VariableResolver::visit(InterfaceBlock &iface) { - /* Block names can't be used for any other identifiers so we can put them - in the same map with instance names. */ - stage->interface_blocks[iface.name] = &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[iface.instance_name] = &iface; + stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface)); SetForScope set_iface(block_interface, iface.interface); TraversingVisitor::visit(iface); @@ -443,14 +498,14 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration } iface_target_block->body.insert(iface_insert_point, iface_var); - iface_target_block->variables[name] = iface_var; + iface_target_block->variables.insert(make_pair(name, iface_var)); return iface_var; } InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block) { - if(stage->interface_blocks.count(out_block.name)) + if(stage->interface_blocks.count("in"+out_block.name)) return 0; InterfaceBlock *in_block = new InterfaceBlock; @@ -472,9 +527,9 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block } iface_target_block->body.insert(iface_insert_point, in_block); - stage->interface_blocks[in_block->name] = in_block; + stage->interface_blocks.insert(make_pair("in"+in_block->name, in_block)); if(!in_block->instance_name.empty()) - stage->interface_blocks[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); @@ -521,10 +576,12 @@ void InterfaceGenerator::visit(VariableReference &var) } const map &prev_blocks = stage->previous->interface_blocks; - map::const_iterator j = prev_blocks.find(var.name); - if(j!=prev_blocks.end() && j->second->interface=="out" && j->second->instance_name==var.name) + map::const_iterator j = prev_blocks.find("_"+var.name); + if(j!=prev_blocks.end() && j->second->interface=="out") { generate_interface(*j->second); + /* Let VariableResolver convert the variable reference into an interface + block reference. */ return; } @@ -556,7 +613,10 @@ void InterfaceGenerator::visit(VariableDeclaration &var) 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; } @@ -608,8 +668,8 @@ 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(iface.name); - if(i!=prev_blocks.end() && i->second->interface=="out" && i->second->name==iface.name) + map::const_iterator i = prev_blocks.find("out"+iface.name); + if(i!=prev_blocks.end()) { iface.linked_block = i->second; i->second->linked_block = &iface;