]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/generate.cpp
Store a pointer to operator info rather than the token in expressions
[libs/gl.git] / source / glsl / generate.cpp
index 751043d9231a64d4c72af4894ec29c39b8143d48..6b336f3179de690b2967cd85fe5da0cafff130ab 100644 (file)
@@ -1,4 +1,6 @@
+#include <msp/core/hash.h>
 #include <msp/core/raii.h>
+#include <msp/strings/lexicalcast.h>
 #include "builtin.h"
 #include "generate.h"
 
@@ -22,20 +24,6 @@ void DeclarationCombiner::visit(Block &block)
        TraversingVisitor::visit(block);
 }
 
-void DeclarationCombiner::visit(FunctionDeclaration &func)
-{
-       vector<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
-       {
-               for(vector<FunctionDeclaration *>::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,30 +61,73 @@ void DeclarationCombiner::visit(VariableDeclaration &var)
 }
 
 
-void BlockResolver::enter(Block &block)
+ConstantSpecializer::ConstantSpecializer():
+       values(0)
+{ }
+
+void ConstantSpecializer::apply(Stage &stage, const map<string, int> *v)
+{
+       values = v;
+       stage.content.visit(*this);
+}
+
+void ConstantSpecializer::visit(VariableDeclaration &var)
+{
+       bool specializable = false;
+       if(var.layout)
+       {
+               vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
+               for(vector<Layout::Qualifier>::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<string, int>::const_iterator i = values->find(var.name);
+               if(i!=values->end())
+               {
+                       RefPtr<Literal> literal = new Literal;
+                       if(var.type=="bool")
+                               literal->token = (i->second ? "true" : "false");
+                       else if(var.type=="int")
+                               literal->token = lexical_cast<string>(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)
@@ -108,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<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
                if(i!=block->variables.end())
                        var.declaration = i->second;
-               else
-               {
-                       const map<string, InterfaceBlock *> &ifaces = block->interfaces;
-                       for(map<string, InterfaceBlock *>::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<string, InterfaceBlock *>::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<string, InterfaceBlock *> &blocks = stage->interface_blocks;
+               map<string, InterfaceBlock *>::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<string, VariableDeclaration *>::iterator j = i->second->members.variables.find(var.name);
+                                       if(j!=i->second->members.variables.end())
+                                               var.declaration = j->second;
+                               }
                }
        }
 
@@ -160,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<string, InterfaceBlock *>::iterator j = block->interfaces.find(iface.name);
-               if(j!=block->interfaces.end())
+               map<string, InterfaceBlock *>::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;
                }
        }
@@ -199,7 +230,7 @@ void VariableResolver::visit(MemberAccess &memacc)
 
 void VariableResolver::visit(BinaryExpression &binary)
 {
-       if(binary.oper=="[")
+       if(binary.oper->token[0]=='[')
        {
                {
                        SetForScope<bool> set(record_target, false);
@@ -230,24 +261,21 @@ void VariableResolver::visit(Assignment &assign)
        self_referencing = false;
        assign.right->visit(*this);
 
-       assign.self_referencing = (self_referencing || assign.oper!="=");
+       assign.self_referencing = (self_referencing || assign.oper->token[0]!='=');
        assign.target_declaration = assignment_target;
 }
 
 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<string, StructDeclaration *>::iterator j = block->types.find(var.type);
-               if(j!=block->types.end())
-                       var.type_declaration = j->second;
-       }
+       map<string, StructDeclaration *>::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;
@@ -260,38 +288,54 @@ 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. */
-       current_block->interfaces[iface.name] = &iface;
+       stage->interface_blocks[iface.name] = &iface;
        if(!iface.instance_name.empty())
-               current_block->interfaces[iface.instance_name] = &iface;
+               stage->interface_blocks[iface.instance_name] = &iface;
 
        SetForScope<string> 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<string, vector<FunctionDeclaration *> >::iterator i = functions.find(call.name);
-       if(i!=functions.end())
-               call.declaration = i->second.back();
+       map<string, FunctionDeclaration *>::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<FunctionDeclaration *> &decls = functions[func.name];
-       if(func.definition)
+       FunctionDeclaration *&stage_decl = stage->functions[func.name];
+       vector<FunctionDeclaration *> &decls = declarations[func.name];
+       if(func.definition==&func)
        {
+               stage_decl = &func;
+
                for(vector<FunctionDeclaration *>::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);
+       {
+               func.definition = 0;
+               if(!stage_decl)
+                       stage_decl = &func;
+               else
+                       func.definition = stage_decl->definition;
+       }
+       decls.push_back(&func);
 
        TraversingVisitor::visit(func);
 }
@@ -364,6 +408,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;
        }
@@ -376,7 +421,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;
@@ -398,9 +443,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<Block *> set_block(current_block, &stage->content);
@@ -415,7 +460,7 @@ ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, E
        VariableReference *ref = new VariableReference;
        ref->name = left;
        assign->left = ref;
-       assign->oper = "=";
+       assign->oper = &Operator::get_operator("=", Operator::BINARY);
        assign->right = right;
 
        ExpressionStatement *stmt = new ExpressionStatement;
@@ -446,7 +491,7 @@ void InterfaceGenerator::visit(VariableReference &var)
                return;
        }
 
-       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->content.interfaces;
+       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
        map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find(var.name);
        if(j!=prev_blocks.end() && j->second->interface=="out" && j->second->instance_name==var.name)
        {
@@ -527,7 +572,7 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
        {
                if(!iface.linked_block && stage->previous)
                {
-                       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->content.interfaces;
+                       const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
                        map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find(iface.name);
                        if(i!=prev_blocks.end() && i->second->interface=="out" && i->second->name==iface.name)
                        {
@@ -577,9 +622,8 @@ void InterfaceGenerator::visit(Passthrough &pass)
 
                BinaryExpression *subscript = new BinaryExpression;
                subscript->left = ref;
-               subscript->oper = "[";
+               subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                subscript->right = pass.subscript;
-               subscript->after = "]";
 
                MemberAccess *memacc = new MemberAccess;
                memacc->left = subscript;
@@ -599,9 +643,8 @@ void InterfaceGenerator::visit(Passthrough &pass)
                {
                        BinaryExpression *subscript = new BinaryExpression;
                        subscript->left = ref;
-                       subscript->oper = "[";
+                       subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                        subscript->right = pass.subscript;
-                       subscript->after = "]";
                        insert_assignment(out_name, subscript);
                }
                else
@@ -611,111 +654,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<Statement>::iterator struct_insert_point = block.body.end();
-       NodeList<Statement>::iterator variable_insert_point = block.body.end();
-       NodeList<Statement>::iterator function_insert_point = block.body.end();
-       unsigned unordered_func_count = 0;
-       bool ordered_any_funcs = false;
-
-       for(NodeList<Statement>::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