]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/generate.cpp
Use default member initializers for simple types
[libs/gl.git] / source / glsl / generate.cpp
index 842ca4f6cdd5ab1f68bb47b3bb657490b9bb9d6a..ec51c19cdd9cc90472a0b2471eff915823fae0d7 100644 (file)
@@ -1,7 +1,6 @@
+#include <msp/core/algorithm.h>
 #include <msp/core/hash.h>
 #include <msp/core/raii.h>
-#include <msp/strings/lexicalcast.h>
-#include "builtin.h"
 #include "generate.h"
 
 using namespace std;
@@ -10,345 +9,41 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void DeclarationCombiner::apply(Stage &stage)
+void ConstantIdAssigner::apply(Module &module, const Features &features)
 {
-       stage.content.visit(*this);
-       NodeRemover().apply(stage, nodes_to_remove);
-}
-
-void DeclarationCombiner::visit(Block &block)
-{
-       if(current_block)
-               return;
-
-       TraversingVisitor::visit(block);
-}
-
-void DeclarationCombiner::visit(VariableDeclaration &var)
-{
-       VariableDeclaration *&ptr = variables[var.name];
-       if(ptr)
-       {
-               ptr->type = var.type;
-               if(var.init_expression)
-                       ptr->init_expression = var.init_expression;
-               if(var.layout)
-               {
-                       if(ptr->layout)
-                       {
-                               for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
-                               {
-                                       bool found = false;
-                                       for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
-                                               if(j->name==i->name)
-                                               {
-                                                       j->has_value = i->value;
-                                                       j->value = i->value;
-                                                       found = true;
-                                               }
-
-                                       if(!found)
-                                               ptr->layout->qualifiers.push_back(*i);
-                               }
-                       }
-                       else
-                               ptr->layout = var.layout;
-               }
-               nodes_to_remove.insert(&var);
-       }
-       else
-               ptr = &var;
-}
-
-
-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():
-       stage(0),
-       members(0),
-       record_target(false),
-       assignment_target(0),
-       self_referencing(false)
-{ }
-
-void VariableResolver::apply(Stage &s)
-{
-       stage = &s;
-       s.types.clear();
-       s.interface_blocks.clear();
-       s.content.visit(*this);
-}
-
-void VariableResolver::enter(Block &block)
-{
-       block.variables.clear();
-}
-
-void VariableResolver::visit(VariableReference &var)
-{
-       var.declaration = 0;
-       members = 0;
-       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;
-       }
-
-       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 = 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;
-                               }
-               }
-       }
-
-       if(record_target)
-       {
-               if(assignment_target)
-               {
-                       record_target = false;
-                       assignment_target = 0;
-               }
-               else
-                       assignment_target = var.declaration;
-       }
-       else if(var.declaration && var.declaration==assignment_target)
-               self_referencing = true;
-}
-
-void VariableResolver::visit(InterfaceBlockReference &iface)
-{
-       iface.declaration = 0;
-       for(Block *block=current_block; block; block=block->parent)
-       {
-               map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find(iface.name);
-               if(i!=stage->interface_blocks.end())
-               {
-                       iface.declaration = i->second;
-                       members = &i->second->members.variables;
-                       break;
-               }
-       }
-}
-
-void VariableResolver::visit(MemberAccess &memacc)
-{
-       members = 0;
-       iface_ref = 0;
-       memacc.left->visit(*this);
-
-       if(iface_ref)
-               memacc.left = iface_ref;
-       iface_ref = 0;
+       for(Stage &s: module.stages)
+               s.content.visit(*this);
 
-       memacc.declaration = 0;
-       if(members)
+       for(VariableDeclaration *v: auto_constants)
        {
-               map<string, VariableDeclaration *>::iterator i = members->find(memacc.member);
-               if(i!=members->end())
-               {
-                       memacc.declaration = i->second;
-                       if(i->second->type_declaration)
-                               members = &i->second->type_declaration->members.variables;
-               }
-               else
-                       members = 0;
-       }
-}
+               unsigned id = hash32(v->name)%features.constant_id_range;
+               while(used_ids.count(id))
+                       id = (id+1)%features.constant_id_range;
 
-void VariableResolver::visit(BinaryExpression &binary)
-{
-       if(binary.oper=="[")
-       {
-               {
-                       SetForScope<bool> set(record_target, false);
-                       binary.right->visit(*this);
-               }
-               members = 0;
-               iface_ref = 0;
-               binary.left->visit(*this);
-               if(iface_ref)
-                       binary.left = iface_ref;
-               iface_ref = 0;
-       }
-       else
-       {
-               TraversingVisitor::visit(binary);
-               members = 0;
-       }
-}
+               auto i = find_member(v->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+               if(i!=v->layout->qualifiers.end())
+                       i->value = id;
 
-void VariableResolver::visit(Assignment &assign)
-{
-       {
-               SetFlag set(record_target);
-               assignment_target = 0;
-               assign.left->visit(*this);
+               used_ids.insert(id);
        }
-
-       self_referencing = false;
-       assign.right->visit(*this);
-
-       assign.self_referencing = (self_referencing || assign.oper!="=");
-       assign.target_declaration = assignment_target;
 }
 
-void VariableResolver::visit(StructDeclaration &strct)
+void ConstantIdAssigner::visit(VariableDeclaration &var)
 {
-       TraversingVisitor::visit(strct);
-       stage->types[strct.name] = &strct;
-}
-
-void VariableResolver::visit(VariableDeclaration &var)
-{
-       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;
-
-       TraversingVisitor::visit(var);
-       current_block->variables[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;
-       if(!iface.instance_name.empty())
-               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, 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)
-{
-       FunctionDeclaration *&stage_decl = stage->functions[func.name];
-       vector<FunctionDeclaration *> &decls = declarations[func.name];
-       if(func.definition==&func)
+       if(var.layout)
        {
-               stage_decl = &func;
-
-               for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
+               auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+               if(i!=var.layout->qualifiers.end() && i->has_value)
                {
-                       (*i)->definition = func.definition;
-                       (*i)->body.body.clear();
+                       if(i->value==-1)
+                               auto_constants.push_back(&var);
+                       else
+                               used_ids.insert(i->value);
                }
        }
-       else
-       {
-               func.definition = 0;
-               if(!stage_decl)
-                       stage_decl = &func;
-               else
-                       func.definition = stage_decl->definition;
-       }
-       decls.push_back(&func);
-
-       TraversingVisitor::visit(func);
 }
 
 
-InterfaceGenerator::InterfaceGenerator():
-       stage(0),
-       function_scope(false),
-       iface_block(0),
-       copy_block(false),
-       iface_target_block(0)
-{ }
-
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
 {
        if(type==Stage::VERTEX)
@@ -373,7 +68,7 @@ void InterfaceGenerator::apply(Stage &s)
 void InterfaceGenerator::visit(Block &block)
 {
        SetForScope<Block *> set_block(current_block, &block);
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+       for(auto i=block.body.begin(); i!=block.body.end(); ++i)
        {
                assignment_insert_point = i;
                if(&block==&stage->content)
@@ -389,17 +84,21 @@ string InterfaceGenerator::change_prefix(const string &name, const string &prefi
        return prefix+name.substr(offset);
 }
 
-bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
+VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
 {
        if(stage->content.variables.count(name))
-               return false;
+               return 0;
+
+       if(stage->type==Stage::GEOMETRY && !copy_block && var.interface=="out" && var.array)
+               return 0;
 
        VariableDeclaration* iface_var = new VariableDeclaration;
        iface_var->sampling = var.sampling;
        iface_var->interface = iface;
        iface_var->type = var.type;
-       iface_var->type_declaration = var.type_declaration;
        iface_var->name = name;
+       /* Geometry shader inputs are always arrays.  But if we're bringing in an
+       entire block, the array is on the block and not individual variables. */
        if(stage->type==Stage::GEOMETRY && !copy_block)
                iface_var->array = ((var.array && var.interface!="in") || iface=="in");
        else
@@ -414,19 +113,22 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
        }
 
        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));
+       if(iface_target_block==&stage->content && iface=="in")
+               declared_inputs.push_back(iface_var);
 
-       return true;
+       return iface_var;
 }
 
-bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
+InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 {
-       if(stage->interface_blocks.count(out_block.name))
-               return false;
+       if(stage->interface_blocks.count("in "+out_block.block_name))
+               return 0;
 
        InterfaceBlock *in_block = new InterfaceBlock;
        in_block->interface = "in";
-       in_block->name = out_block.name;
+       in_block->block_name = out_block.block_name;
+       in_block->members = new Block;
        in_block->instance_name = out_block.instance_name;
        if(stage->type==Stage::GEOMETRY)
                in_block->array = true;
@@ -437,21 +139,24 @@ bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 
        {
                SetFlag set_copy(copy_block, true);
-               SetForScope<Block *> set_target(iface_target_block, &in_block->members);
-               SetForScope<NodeList<Statement>::iterator> set_ins_pt(iface_insert_point, in_block->members.body.end());
-               out_block.members.visit(*this);
+               SetForScope<Block *> set_target(iface_target_block, in_block->members.get());
+               SetForScope<NodeList<Statement>::iterator> set_ins_pt(iface_insert_point, in_block->members->body.end());
+               if(out_block.struct_declaration)
+                       out_block.struct_declaration->members.visit(*this);
+               else if(out_block.members)
+                       out_block.members->visit(*this);
        }
 
        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->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<Block *> set_block(current_block, &stage->content);
        in_block->visit(*this);
 
-       return true;
+       return in_block;
 }
 
 ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
@@ -460,7 +165,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;
@@ -475,37 +180,46 @@ void InterfaceGenerator::visit(VariableReference &var)
 {
        if(var.declaration || !stage->previous)
                return;
-       /* Don't pull a variable from previous stage if we just generated an out
+       /* Don't pull a variable from previous stage if we just generated an output
        interface in this stage */
        if(stage->content.variables.count(var.name))
                return;
 
        const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
-       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+       auto i = prev_vars.find(var.name);
        if(i==prev_vars.end() || i->second->interface!="out")
                i = prev_vars.find(in_prefix+var.name);
        if(i!=prev_vars.end() && i->second->interface=="out")
        {
-               generate_interface(*i->second, "in", i->second->name);
-               var.name = i->second->name;
+               if(stage->type==Stage::GEOMETRY && i->second->array)
+                       stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+                               format("Can't access '%s' through automatic interface because it's an array", var.name)));
+               else
+               {
+                       generate_interface(*i->second, "in", i->second->name);
+                       var.name = i->second->name;
+               }
                return;
        }
 
        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)
+       auto 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;
        }
 
-       for(j=prev_blocks.begin(); j!=prev_blocks.end(); ++j)
-               if(j->second->instance_name.empty())
+       for(const auto &kvp: prev_blocks)
+               if(kvp.second->instance_name.empty() && kvp.second->struct_declaration)
                {
-                       i = j->second->members.variables.find(var.name);
-                       if(i!=j->second->members.variables.end())
+                       const map<string, VariableDeclaration *> &iface_vars = kvp.second->struct_declaration->members.variables;
+                       i = iface_vars.find(var.name);
+                       if(i!=iface_vars.end())
                        {
-                               generate_interface(*j->second);
+                               generate_interface(*kvp.second);
                                return;
                        }
                }
@@ -514,29 +228,16 @@ void InterfaceGenerator::visit(VariableReference &var)
 void InterfaceGenerator::visit(VariableDeclaration &var)
 {
        if(copy_block)
-       {
                generate_interface(var, "in", var.name);
-               return;
-       }
-
-       if(iface_block)
+       else if(var.interface=="out")
        {
-               if(iface_block->linked_block)
-               {
-                       const map<string, VariableDeclaration *> &linked_vars = iface_block->linked_block->members.variables;
-                       map<string, VariableDeclaration *>::const_iterator i = linked_vars.find(var.name);
-                       if(i!=linked_vars.end())
-                               var.linked_declaration = i->second;
-               }
-               return;
-       }
-
-       if(var.interface=="out")
-       {
-               /* For out variables in function scope, generate a global interface and
-               replace the local declaration with an assignment. */
-               if(function_scope && generate_interface(var, "out", var.name))
+               /* For output variables in function scope, generate a global interface
+               and replace the local declaration with an assignment. */
+               VariableDeclaration *out_var = 0;
+               if(function_scope && (out_var=generate_interface(var, "out", var.name)))
                {
+                       out_var->source = var.source;
+                       out_var->line = var.line;
                        nodes_to_remove.insert(&var);
                        if(var.init_expression)
                        {
@@ -547,14 +248,17 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
                        }
                }
        }
-       else if(var.interface=="in")
+       else if(var.interface=="in" && current_block==&stage->content)
        {
-               /* Try to link in variables in global scope with out variables from
-               previous stage */
-               if(current_block==&stage->content && !var.linked_declaration && stage->previous)
+               if(var.name.compare(0, 3, "gl_"))
+                       declared_inputs.push_back(&var);
+
+               /* Try to link input variables in global scope with output variables from
+               previous stage. */
+               if(!var.linked_declaration && stage->previous)
                {
                        const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
-                       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+                       auto i = prev_vars.find(var.name);
                        if(i!=prev_vars.end() && i->second->interface=="out")
                        {
                                var.linked_declaration = i->second;
@@ -570,11 +274,13 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
 {
        if(iface.interface=="in")
        {
+               /* Try to link input blocks with output blocks sharing the same block
+               name from previous stage. */
                if(!iface.linked_block && stage->previous)
                {
                        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)
+                       auto i = prev_blocks.find("out "+iface.block_name);
+                       if(i!=prev_blocks.end())
                        {
                                iface.linked_block = i->second;
                                i->second->linked_block = &iface;
@@ -582,7 +288,6 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
                }
        }
 
-       SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
        TraversingVisitor::visit(iface);
 }
 
@@ -595,36 +300,34 @@ void InterfaceGenerator::visit(FunctionDeclaration &func)
 
 void InterfaceGenerator::visit(Passthrough &pass)
 {
-       vector<VariableDeclaration *> pass_vars;
-
-       for(map<string, VariableDeclaration *>::const_iterator i=stage->content.variables.begin(); i!=stage->content.variables.end(); ++i)
-               if(i->second->interface=="in")
-                       pass_vars.push_back(i->second);
+       // Pass through all input variables declared so far.
+       vector<VariableDeclaration *> pass_vars = declared_inputs;
 
        if(stage->previous)
        {
-               const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
-               for(map<string, VariableDeclaration *>::const_iterator i=prev_vars.begin(); i!=prev_vars.end(); ++i)
+               for(const auto &kvp: stage->previous->content.variables)
                {
-                       bool linked = false;
-                       for(vector<VariableDeclaration *>::const_iterator j=pass_vars.begin(); (!linked && j!=pass_vars.end()); ++j)
-                               linked = ((*j)->linked_declaration==i->second);
+                       if(kvp.second->interface!="out")
+                               continue;
 
-                       if(!linked && generate_interface(*i->second, "in", i->second->name))
-                               pass_vars.push_back(i->second);
+                       /* Pass through output variables from the previous stage, but only
+                       those which are not already linked to an input here. */
+                       if(!kvp.second->linked_declaration && generate_interface(*kvp.second, "in", kvp.second->name))
+                               pass_vars.push_back(kvp.second);
                }
        }
 
        if(stage->type==Stage::GEOMETRY)
        {
+               /* Special case for geometry shader: copy gl_Position from input to
+               output. */
                InterfaceBlockReference *ref = new InterfaceBlockReference;
                ref->name = "gl_in";
 
                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;
@@ -633,20 +336,19 @@ void InterfaceGenerator::visit(Passthrough &pass)
                insert_assignment("gl_Position", memacc);
        }
 
-       for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
+       for(VariableDeclaration *v: pass_vars)
        {
-               string out_name = change_prefix((*i)->name, out_prefix);
-               generate_interface(**i, "out", out_name);
+               string out_name = change_prefix(v->name, out_prefix);
+               generate_interface(*v, "out", out_name);
 
                VariableReference *ref = new VariableReference;
-               ref->name = (*i)->name;
+               ref->name = v->name;
                if(pass.subscript)
                {
                        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