Transform interface block contents into structs

[libs/gl.git] / source / glsl / generate.cpp

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 4fd8c6ab79aeb3453c1501332dc19953bf42e8d5..53676c26784cf7d32709639fea843459e3cf4269 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -123,6 +123,7 @@ void BlockHierarchyResolver::enter(Block &block)
 
 TypeResolver::TypeResolver():
        stage(0),
+       iface_block(0),
        r_any_resolved(false)
 { }
 
@@ -214,6 +215,34 @@ void TypeResolver::visit(StructDeclaration &strct)
 void TypeResolver::visit(VariableDeclaration &var)
 {
        resolve_type(var.type_declaration, var.type, var.array);
+       if(iface_block && var.interface==iface_block->interface)
+               var.interface.clear();
+}
+
+void TypeResolver::visit(InterfaceBlock &iface)
+{
+       if(iface.members)
+       {
+               SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
+               iface.members->visit(*this);
+
+               StructDeclaration *strct = new StructDeclaration;
+               strct->source = INTERNAL_SOURCE;
+               strct->name = format("_%s_%s", iface.interface, iface.name);
+               strct->members.body.splice(strct->members.body.begin(), iface.members->body);
+               stage->content.body.insert(type_insert_point, strct);
+               stage->types.insert(make_pair(strct->name, strct));
+
+               iface.members = 0;
+               strct->interface_block = &iface;
+               iface.struct_declaration = strct;
+       }
+
+       TypeDeclaration *type = iface.struct_declaration;
+       if(type && iface.array)
+               type = get_or_create_array_type(*type);
+       r_any_resolved = (type!=iface.type_declaration);
+       iface.type_declaration = type;
 }
 
 void TypeResolver::visit(FunctionDeclaration &func)
@@ -250,7 +279,10 @@ void VariableResolver::visit_and_replace(RefPtr<Expression> &expr)
        r_replacement_expr = 0;
        expr->visit(*this);
        if(r_replacement_expr)
+       {
                expr = r_replacement_expr;
+               r_any_resolved = true;
+       }
        r_replacement_expr = 0;
 }
 
@@ -287,10 +319,11 @@ void VariableResolver::visit(VariableReference &var)
                {
                        // Look for the variable in anonymous interface blocks.
                        for(i=blocks.begin(); (!declaration && i!=blocks.end()); ++i)
-                               if(i->second->instance_name.empty())
+                               if(i->second->instance_name.empty() && i->second->struct_declaration)
                                {
-                                       map<string, VariableDeclaration *>::iterator j = i->second->members.variables.find(var.name);
-                                       if(j!=i->second->members.variables.end())
+                                       const map<string, VariableDeclaration *> &iface_vars = i->second->struct_declaration->members.variables;
+                                       map<string, VariableDeclaration *>::const_iterator j = iface_vars.find(var.name);
+                                       if(j!=iface_vars.end())
                                                declaration = j->second;
                                }
                }
@@ -327,20 +360,11 @@ void VariableResolver::visit(MemberAccess &memacc)
 {
        visit_and_replace(memacc.left);
 
-       map<string, VariableDeclaration *> *members = 0;
-       if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
-               members = &strct->members.variables;
-       else if(InterfaceBlockReference *iface_ref = dynamic_cast<InterfaceBlockReference *>(memacc.left.get()))
-       {
-               if(iface_ref->declaration)
-                       members = &iface_ref->declaration->members.variables;
-       }
-
        VariableDeclaration *declaration = 0;
-       if(members)
+       if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
        {
-               map<string, VariableDeclaration *>::iterator i = members->find(memacc.member);
-               if(i!=members->end())
+               map<string, VariableDeclaration *>::iterator i = strct->members.variables.find(memacc.member);
+               if(i!=strct->members.variables.end())
                        declaration = i->second;
        }
 
@@ -395,9 +419,6 @@ void VariableResolver::visit(FunctionCall &call)
 
 void VariableResolver::visit(VariableDeclaration &var)
 {
-       if(!block_interface.empty() && var.interface.empty())
-               var.interface = block_interface;
-
        if(var.layout)
                var.layout->visit(*this);
        if(var.array_size)
@@ -415,7 +436,6 @@ void VariableResolver::visit(InterfaceBlock &iface)
        if(!iface.instance_name.empty())
                stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface));
 
-       SetForScope<string> set_iface(block_interface, iface.interface);
        TraversingVisitor::visit(iface);
 }
 
@@ -557,7 +577,8 @@ void ExpressionResolver::visit(VariableReference &var)
 
 void ExpressionResolver::visit(InterfaceBlockReference &iface)
 {
-       resolve(iface, 0, true);
+       if(iface.declaration)
+               resolve(iface, iface.declaration->type_declaration, true);
 }
 
 void ExpressionResolver::visit(MemberAccess &memacc)
@@ -861,7 +882,6 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 InterfaceGenerator::InterfaceGenerator():
        stage(0),
        function_scope(false),
-       iface_block(0),
        copy_block(false),
        iface_target_block(0)
 { }
@@ -945,6 +965,7 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block
        InterfaceBlock *in_block = new InterfaceBlock;
        in_block->interface = "in";
        in_block->name = out_block.name;
+       in_block->members = new Block;
        in_block->instance_name = out_block.instance_name;
        if(stage->type==Stage::GEOMETRY)
                in_block->array = true;
@@ -955,9 +976,12 @@ InterfaceBlock *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);
@@ -1020,10 +1044,11 @@ void InterfaceGenerator::visit(VariableReference &var)
        }
 
        for(j=prev_blocks.begin(); j!=prev_blocks.end(); ++j)
-               if(j->second->instance_name.empty())
+               if(j->second->instance_name.empty() && j->second->struct_declaration)
                {
-                       i = j->second->members.variables.find(var.name);
-                       if(i!=j->second->members.variables.end())
+                       const map<string, VariableDeclaration *> &iface_vars = j->second->struct_declaration->members.variables;
+                       i = iface_vars.find(var.name);
+                       if(i!=iface_vars.end())
                        {
                                generate_interface(*j->second);
                                return;
@@ -1034,28 +1059,8 @@ void InterfaceGenerator::visit(VariableReference &var)
 void InterfaceGenerator::visit(VariableDeclaration &var)
 {
        if(copy_block)
-       {
                generate_interface(var, "in", var.name);
-               return;
-       }
-
-       if(iface_block)
-       {
-               if(iface_block->linked_block)
-               {
-                       // Link all variables to their counterparts in the 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;
-                               var.linked_declaration->linked_declaration = &var;
-                       }
-               }
-               return;
-       }
-
-       if(var.interface=="out")
+       else if(var.interface=="out")
        {
                /* For output variables in function scope, generate a global interface
                and replace the local declaration with an assignment. */
@@ -1111,7 +1116,6 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
                }
        }
 
-       SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
        TraversingVisitor::visit(iface);
 }