X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fgenerate.cpp;h=13f67d8cade070a4349bb2335080b27d1a2c790c;hb=518f751d385b733adbf43fe4056403740709edec;hp=e037e0a5bb09ee7ee26cb1bee9eb62155d41a2c3;hpb=64d98b0b4fb3214a3ca67ab1b239c120748e8e35;p=libs%2Fgl.git diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index e037e0a5..13f67d8c 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -1,4 +1,6 @@ +#include #include +#include #include "builtin.h" #include "generate.h" @@ -22,20 +24,6 @@ void DeclarationCombiner::visit(Block &block) TraversingVisitor::visit(block); } -void DeclarationCombiner::visit(FunctionDeclaration &func) -{ - vector &decls = functions[func.name]; - if(func.definition) - { - for(vector::iterator i=decls.begin(); i!=decls.end(); ++i) - { - (*i)->definition = func.definition; - (*i)->body.body.clear(); - } - } - decls.push_back(&func); -} - void DeclarationCombiner::visit(VariableDeclaration &var) { VariableDeclaration *&ptr = variables[var.name]; @@ -73,40 +61,73 @@ 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"); + else if(var.type=="int") + literal->token = lexical_cast(i->second); + var.init_expression = literal; + } + } +} + + +void BlockHierarchyResolver::enter(Block &block) +{ + block.parent = current_block; } VariableResolver::VariableResolver(): - builtins(0), + stage(0), members(0), record_target(false), assignment_target(0), self_referencing(false) { } -void VariableResolver::apply(Stage &stage) -{ - Stage *builtin_stage = get_builtins(stage.type); - builtins = (builtin_stage ? &builtin_stage->content : 0); - stage.content.visit(*this); -} - -Block *VariableResolver::next_block(Block &block) +void VariableResolver::apply(Stage &s) { - return block.parent ? block.parent : &block!=builtins ? builtins : 0; + stage = &s; + s.types.clear(); + s.interface_blocks.clear(); + s.content.visit(*this); } void VariableResolver::enter(Block &block) @@ -118,38 +139,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=block->parent) { 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; + } } } @@ -170,13 +191,13 @@ void VariableResolver::visit(VariableReference &var) void VariableResolver::visit(InterfaceBlockReference &iface) { iface.declaration = 0; - for(Block *block=current_block; block; block=next_block(*block)) + for(Block *block=current_block; block; block=block->parent) { - 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 +268,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,34 +286,55 @@ 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); } +void FunctionResolver::apply(Stage &s) +{ + stage = &s; + s.functions.clear(); + s.content.visit(*this); +} + void FunctionResolver::visit(FunctionCall &call) { - map >::iterator i = functions.find(call.name); - if(i!=functions.end()) - call.declaration = i->second.back(); + 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) { - vector &decls = functions[func.name]; - if(func.definition) + FunctionDeclaration *&stage_decl = stage->functions[func.name]; + vector &decls = declarations[func.name]; + if(func.definition==&func) { + stage_decl = &func; + for(vector::iterator i=decls.begin(); i!=decls.end(); ++i) + { (*i)->definition = func.definition; - decls.clear(); - decls.push_back(&func); + (*i)->body.body.clear(); + } } - else if(!decls.empty() && decls.back()->definition) - func.definition = decls.back()->definition; else - decls.push_back(&func); + { + if(!stage_decl) + stage_decl = &func; + + func.definition = stage_decl->definition; + } + decls.push_back(&func); TraversingVisitor::visit(func); } @@ -368,6 +407,7 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri iface_var->array_size = var.array_size; if(iface=="in") { + iface_var->layout = var.layout; iface_var->linked_declaration = &var; var.linked_declaration = iface_var; } @@ -380,7 +420,7 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block) { - if(stage->content.interfaces.count(out_block.name)) + if(stage->interface_blocks.count(out_block.name)) return false; InterfaceBlock *in_block = new InterfaceBlock; @@ -402,9 +442,9 @@ bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block) } iface_target_block->body.insert(iface_insert_point, in_block); - iface_target_block->interfaces[in_block->name] = in_block; + stage->interface_blocks[in_block->name] = in_block; if(!in_block->instance_name.empty()) - stage->content.interfaces[in_block->instance_name] = in_block; + stage->interface_blocks[in_block->instance_name] = in_block; SetFlag set_scope(function_scope, false); SetForScope set_block(current_block, &stage->content); @@ -450,7 +490,7 @@ void InterfaceGenerator::visit(VariableReference &var) return; } - const map &prev_blocks = stage->previous->content.interfaces; + 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) { @@ -531,7 +571,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) { @@ -615,111 +655,6 @@ void InterfaceGenerator::visit(Passthrough &pass) nodes_to_remove.insert(&pass); } - -DeclarationReorderer::DeclarationReorderer(): - kind(NO_DECLARATION) -{ } - -void DeclarationReorderer::visit(FunctionCall &call) -{ - FunctionDeclaration *def = call.declaration; - if(def) - def = def->definition; - if(def && !ordered_funcs.count(def)) - needed_funcs.insert(def); -} - -void DeclarationReorderer::visit(Block &block) -{ - if(block.parent) - return TraversingVisitor::visit(block); - - NodeList::iterator struct_insert_point = block.body.end(); - NodeList::iterator variable_insert_point = block.body.end(); - NodeList::iterator function_insert_point = block.body.end(); - unsigned unordered_func_count = 0; - bool ordered_any_funcs = false; - - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ) - { - kind = NO_DECLARATION; - (*i)->visit(*this); - - bool moved = false; - if(kind==STRUCT && struct_insert_point!=block.body.end()) - { - block.body.insert(struct_insert_point, *i); - moved = true; - } - else if(kind>STRUCT && struct_insert_point==block.body.end()) - struct_insert_point = i; - - if(kind==VARIABLE && variable_insert_point!=block.body.end()) - { - block.body.insert(variable_insert_point, *i); - moved = true; - } - else if(kind>VARIABLE && variable_insert_point==block.body.end()) - variable_insert_point = i; - - if(kind==FUNCTION) - { - if(function_insert_point==block.body.end()) - function_insert_point = i; - - if(needed_funcs.empty()) - { - ordered_funcs.insert(i->get()); - if(i!=function_insert_point) - { - block.body.insert(function_insert_point, *i); - moved = true; - } - else - ++function_insert_point; - ordered_any_funcs = true; - } - else - ++unordered_func_count; - } - - if(moved) - { - if(function_insert_point==i) - ++function_insert_point; - block.body.erase(i++); - } - else - ++i; - - if(i==block.body.end() && unordered_func_count) - { - if(!ordered_any_funcs) - // A subset of the remaining functions forms a recursive loop - /* TODO pick a function and move it up, adding any necessary - declarations */ - break; - - i = function_insert_point; - unordered_func_count = 0; - } - } -} - -void DeclarationReorderer::visit(VariableDeclaration &var) -{ - TraversingVisitor::visit(var); - kind = VARIABLE; -} - -void DeclarationReorderer::visit(FunctionDeclaration &func) -{ - needed_funcs.clear(); - func.body.visit(*this); - needed_funcs.erase(&func); - kind = FUNCTION; -} - } // namespace SL } // namespace GL } // namespace Msp