Unify handling of variables and interface blocks in the GLSL compiler

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

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 481f38fb5ae729b3a16b03725ec7c1f7dd9c71cf..4828a00c452ad1e35e54156f97dfaf2ef4a4ffd8 100644 (file)
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -541,16 +541,6 @@ void SpirVGenerator::visit(VariableReference &var)
                r_expression_result_id = get_load_id(*var.declaration);
 }
 
-void SpirVGenerator::visit(InterfaceBlockReference &iface)
-{
-       if(!composite_access || !current_function)
-               throw internal_error("invalid interface block reference");
-
-       r_composite_base = iface.declaration;
-       r_expression_result_id = 0;
-       r_constant_result = false;
-}
-
 void SpirVGenerator::generate_composite_access(TypeDeclaration &result_type)
 {
        Opcode opcode;
@@ -1528,10 +1518,10 @@ void SpirVGenerator::visit(StructDeclaration &strct)
        Id type_id = allocate_id(strct, 0);
        writer.write_op_name(type_id, strct.name);
 
-       if(strct.interface_block)
+       if(!strct.block_name.empty())
                writer.write_op_decorate(type_id, DECO_BLOCK);
 
-       bool builtin = (strct.interface_block && !strct.interface_block->block_name.compare(0, 3, "gl_"));
+       bool builtin = !strct.block_name.compare(0, 3, "gl_");
        vector<Id> member_type_ids;
        member_type_ids.reserve(strct.members.body.size());
        for(const RefPtr<Statement> &s: strct.members.body)
@@ -1615,11 +1605,20 @@ void SpirVGenerator::visit(VariableDeclaration &var)
        }
        else
        {
-               StorageClass storage = (current_function ? STORAGE_FUNCTION : get_interface_storage(var.interface, false));
+               bool push_const = has_layout_qualifier(var.layout.get(), "push_constant");
+
+               StorageClass storage;
+               if(current_function)
+                       storage = STORAGE_FUNCTION;
+               else if(push_const)
+                       storage = STORAGE_PUSH_CONSTANT;
+               else
+                       storage = get_interface_storage(var.interface, var.block_declaration);
+
                Id ptr_type_id = get_pointer_type_id(type_id, storage);
                if(var.interface=="uniform")
                {
-                       Id &uni_id = declared_uniform_ids["v"+var.name];
+                       Id &uni_id = declared_uniform_ids[var.block_declaration ? "b"+var.block_declaration->block_name : "v"+var.name];
                        if(uni_id)
                        {
                                insert_unique(declared_ids, &var, Declaration(uni_id, ptr_type_id));
@@ -1662,7 +1661,7 @@ void SpirVGenerator::visit(VariableDeclaration &var)
                                        writer.write_op_decorate(var_id, DECO_BINDING, q.value);
                        }
                }
-               if(!var.name.compare(0, 3, "gl_"))
+               if(!var.block_declaration && !var.name.compare(0, 3, "gl_"))
                {
                        BuiltinSemantic semantic = get_builtin_semantic(var.name);
                        writer.write_op_decorate(var_id, DECO_BUILTIN, semantic);
@@ -1678,48 +1677,6 @@ void SpirVGenerator::visit(VariableDeclaration &var)
        writer.write_op_name(var_id, var.name);
 }
 
-void SpirVGenerator::visit(InterfaceBlock &iface)
-{
-       bool push_const = has_layout_qualifier(iface.layout.get(), "push_constant");
-
-       StorageClass storage = (push_const ? STORAGE_PUSH_CONSTANT : get_interface_storage(iface.interface, true));
-       Id type_id;
-       if(iface.array)
-               type_id = get_array_type_id(*iface.struct_declaration, 0, true);
-       else
-               type_id = get_id(*iface.struct_declaration);
-       Id ptr_type_id = get_pointer_type_id(type_id, storage);
-
-       Id block_id;
-       if(iface.interface=="uniform")
-       {
-               Id &uni_id = declared_uniform_ids["b"+iface.block_name];
-               if(uni_id)
-               {
-                       insert_unique(declared_ids, &iface, Declaration(uni_id, ptr_type_id));
-                       return;
-               }
-
-               uni_id = block_id = allocate_id(iface, ptr_type_id);
-       }
-       else
-               block_id = allocate_id(iface, ptr_type_id);
-       writer.write_op_name(block_id, iface.instance_name);
-
-       writer.write_op(content.globals, OP_VARIABLE, ptr_type_id, block_id, storage);
-
-       if(iface.layout)
-       {
-               for(const Layout::Qualifier &q: iface.layout->qualifiers)
-               {
-                       if(q.name=="set")
-                               writer.write_op_decorate(block_id, DECO_DESCRIPTOR_SET, q.value);
-                       else if(q.name=="binding")
-                               writer.write_op_decorate(block_id, DECO_BINDING, q.value);
-               }
-       }
-}
-
 void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 {
        writer.begin_op(content.entry_points, OP_ENTRY_POINT);
@@ -1735,15 +1692,9 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 
        set<Node *> dependencies = DependencyCollector().apply(func);
        for(Node *n: dependencies)
-       {
                if(const VariableDeclaration *var = dynamic_cast<const VariableDeclaration *>(n))
-               {
                        if(!var->interface.empty())
                                writer.write(get_id(*n));
-               }
-               else if(dynamic_cast<InterfaceBlock *>(n))
-                       writer.write(get_id(*n));
-       }
 
        writer.end_op(OP_ENTRY_POINT);