X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=2ac37a6ffae788a16c6cc367dbcf53b9fdb61dcb;hb=6288c42adde9ee7d39a47de51fa2856cf965dccc;hp=434dbe7a8486e0d73104c9a2c0e0ad451c67d39a;hpb=bd8816692056230c36504dcccd76c6946dff47b1;p=libs%2Fgl.git diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index 434dbe7a..2ac37a6f 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -1,4 +1,6 @@ +#include #include +#include #include "builtin.h" #include "generate.h" @@ -73,23 +75,67 @@ void DeclarationCombiner::visit(VariableDeclaration &var) } -void BlockResolver::enter(Block &block) +ConstantSpecializer::ConstantSpecializer(): + values(0) +{ } + +void ConstantSpecializer::apply(Stage &stage, const map *v) { - block.parent = current_block; + values = v; + stage.content.visit(*this); } -void BlockResolver::visit(InterfaceBlock &iface) +void ConstantSpecializer::visit(VariableDeclaration &var) { - /* Block names can't be used for any other identifiers so we can put them - in the same map with instance names. */ - current_block->interfaces[iface.name] = &iface; - if(!iface.instance_name.empty()) - current_block->interfaces[iface.instance_name] = &iface; - TraversingVisitor::visit(iface); + 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 BlockResolver::enter(Block &block) +{ + block.parent = current_block; } VariableResolver::VariableResolver(): + stage(0), builtins(0), members(0), record_target(false), @@ -97,11 +143,12 @@ VariableResolver::VariableResolver(): self_referencing(false) { } -void VariableResolver::apply(Stage &stage) +void VariableResolver::apply(Stage &s) { - Stage *builtin_stage = get_builtins(stage.type); + stage = &s; + Stage *builtin_stage = get_builtins(s.type); builtins = (builtin_stage ? &builtin_stage->content : 0); - stage.content.visit(*this); + s.content.visit(*this); } Block *VariableResolver::next_block(Block &block) @@ -118,38 +165,38 @@ void VariableResolver::visit(VariableReference &var) { var.declaration = 0; members = 0; - for(Block *block=current_block; block; block=next_block(*block)) + for(Block *block=current_block; (!var.declaration && block); block=next_block(*block)) { map::iterator i = block->variables.find(var.name); if(i!=block->variables.end()) var.declaration = i->second; - else - { - const map &ifaces = block->interfaces; - for(map::const_iterator j=ifaces.begin(); (!var.declaration && j!=ifaces.end()); ++j) - if(j->second->instance_name.empty()) - { - i = j->second->members.variables.find(var.name); - if(i!=j->second->members.variables.end()) - var.declaration = i->second; - } - } - - if(var.declaration) - { - if(var.declaration->type_declaration) - members = &var.declaration->type_declaration->members.variables; - break; - } + } - map::iterator j = block->interfaces.find(var.name); - if(j!=block->interfaces.end() && j->second->instance_name==var.name) + if(var.declaration) + { + if(var.declaration->type_declaration) + members = &var.declaration->type_declaration->members.variables; + } + else + { + const map &blocks = stage->interface_blocks; + map::const_iterator i = blocks.find(var.name); + if(i!=blocks.end() && i->second->instance_name==var.name) { iface_ref = new InterfaceBlockReference; iface_ref->name = var.name; - iface_ref->declaration = j->second; - members = &j->second->members.variables; - break; + iface_ref->declaration = i->second; + members = &i->second->members.variables; + } + else + { + for(i=blocks.begin(); (!var.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()) + var.declaration = j->second; + } } } @@ -172,11 +219,11 @@ void VariableResolver::visit(InterfaceBlockReference &iface) iface.declaration = 0; for(Block *block=current_block; block; block=next_block(*block)) { - map::iterator j = block->interfaces.find(iface.name); - if(j!=block->interfaces.end()) + map::iterator i = stage->interface_blocks.find(iface.name); + if(i!=stage->interface_blocks.end()) { - iface.declaration = j->second; - members = &j->second->members.variables; + iface.declaration = i->second; + members = &i->second->members.variables; break; } } @@ -247,17 +294,14 @@ void VariableResolver::visit(Assignment &assign) void VariableResolver::visit(StructDeclaration &strct) { TraversingVisitor::visit(strct); - current_block->types[strct.name] = &strct; + stage->types[strct.name] = &strct; } void VariableResolver::visit(VariableDeclaration &var) { - for(Block *block=current_block; block; block=next_block(*block)) - { - map::iterator j = block->types.find(var.type); - if(j!=block->types.end()) - var.type_declaration = j->second; - } + 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; @@ -268,6 +312,12 @@ void VariableResolver::visit(VariableDeclaration &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; + if(!iface.instance_name.empty()) + stage->interface_blocks[iface.instance_name] = &iface; + SetForScope set_iface(block_interface, iface.interface); TraversingVisitor::visit(iface); } @@ -304,7 +354,9 @@ void FunctionResolver::visit(FunctionDeclaration &func) InterfaceGenerator::InterfaceGenerator(): stage(0), function_scope(false), - iface_block(0) + iface_block(0), + copy_block(false), + iface_target_block(0) { } string InterfaceGenerator::get_out_prefix(Stage::Type type) @@ -320,6 +372,7 @@ string InterfaceGenerator::get_out_prefix(Stage::Type type) void InterfaceGenerator::apply(Stage &s) { stage = &s; + iface_target_block = &stage->content; if(stage->previous) in_prefix = get_out_prefix(stage->previous->type); out_prefix = get_out_prefix(stage->type); @@ -357,19 +410,56 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri iface_var->type = var.type; iface_var->type_declaration = var.type_declaration; iface_var->name = name; - if(stage->type==Stage::GEOMETRY) + if(stage->type==Stage::GEOMETRY && !copy_block) iface_var->array = ((var.array && var.interface!="in") || iface=="in"); else iface_var->array = var.array; if(iface_var->array) iface_var->array_size = var.array_size; + iface_var->layout = var.layout; if(iface=="in") { iface_var->linked_declaration = &var; var.linked_declaration = iface_var; } - stage->content.body.insert(iface_insert_point, iface_var); - stage->content.variables[name] = iface_var; + + iface_target_block->body.insert(iface_insert_point, iface_var); + iface_target_block->variables[name] = iface_var; + + return true; +} + +bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block) +{ + if(stage->interface_blocks.count(out_block.name)) + return false; + + InterfaceBlock *in_block = new InterfaceBlock; + in_block->interface = "in"; + in_block->name = out_block.name; + in_block->instance_name = out_block.instance_name; + if(stage->type==Stage::GEOMETRY) + in_block->array = true; + else + in_block->array = out_block.array; + in_block->linked_block = &out_block; + out_block.linked_block = in_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); + } + + iface_target_block->body.insert(iface_insert_point, in_block); + stage->interface_blocks[in_block->name] = in_block; + if(!in_block->instance_name.empty()) + stage->interface_blocks[in_block->instance_name] = in_block; + + SetFlag set_scope(function_scope, false); + SetForScope set_block(current_block, &stage->content); + in_block->visit(*this); return true; } @@ -408,11 +498,37 @@ void InterfaceGenerator::visit(VariableReference &var) { 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); + if(j!=prev_blocks.end() && j->second->interface=="out" && j->second->instance_name==var.name) + { + generate_interface(*j->second); + return; + } + + for(j=prev_blocks.begin(); j!=prev_blocks.end(); ++j) + if(j->second->instance_name.empty()) + { + i = j->second->members.variables.find(var.name); + if(i!=j->second->members.variables.end()) + { + generate_interface(*j->second); + return; + } + } } void InterfaceGenerator::visit(VariableDeclaration &var) { + if(copy_block) + { + generate_interface(var, "in", var.name); + return; + } + if(iface_block) { if(iface_block->linked_block) @@ -466,7 +582,7 @@ void InterfaceGenerator::visit(InterfaceBlock &iface) { if(!iface.linked_block && stage->previous) { - const map &prev_blocks = stage->previous->content.interfaces; + 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) {