Improve layout qualifier handling with some more utility functions

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

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index 3bdca5cb7d02dcbf786e69dd60d9f0b3b394d554..7eb0165dc5b82156d6a71caca7953508ad74aa33 100644 (file)
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -46,12 +46,7 @@ void StructOrganizer::visit(VariableDeclaration &var)
                if(layout_offset)
                        *layout_offset = offset;
                else
-               {
-                       if(!var.layout)
-                               var.layout = new Layout;
-
-                       var.layout->qualifiers.push_back(Layout::Qualifier("offset", offset));
-               }
+                       add_layout_qualifier(var.layout, Layout::Qualifier("offset", offset));
 
                if(!has_matrix_order)
                {
@@ -59,7 +54,7 @@ void StructOrganizer::visit(VariableDeclaration &var)
                        while(basic && basic->kind==BasicTypeDeclaration::ARRAY)
                                basic = dynamic_cast<const BasicTypeDeclaration *>(basic->base_type);
                        if(basic && basic->kind==BasicTypeDeclaration::MATRIX)
-                               var.layout->qualifiers.push_back(Layout::Qualifier("column_major"));
+                               add_layout_qualifier(var.layout, Layout::Qualifier("column_major"));
                }
 
                offset += mem_reqs.size;
@@ -111,7 +106,7 @@ void LocationAllocator::allocate_locations(const string &iface)
                        auto j = uniforms.find((*i)->name);
                        if(j!=uniforms.end() && j->second.location>=0)
                        {
-                               add_layout_value((*i)->layout, "location", j->second.location);
+                               add_layout_qualifier((*i)->layout, Layout::Qualifier("location", j->second.location));
                                continue;
                        }
                }
@@ -130,7 +125,7 @@ void LocationAllocator::allocate_locations(const string &iface)
                        next = blocking+1;
                }
 
-               add_layout_value((*i)->layout, "location", next);
+               add_layout_qualifier((*i)->layout, Layout::Qualifier("location", next));
                if((*i)->interface=="uniform")
                        uniforms[(*i)->name].location = next;
 
@@ -146,7 +141,7 @@ void LocationAllocator::bind_uniform(RefPtr<Layout> &layout, const string &name,
 {
        auto i = uniforms.find(name);
        if(i!=uniforms.end() && i->second.bind_point>=0)
-               add_layout_value(layout, "binding", i->second.bind_point);
+               add_layout_qualifier(layout, Layout::Qualifier("binding", i->second.bind_point));
        else
        {
                set<unsigned> &used = used_bindings[0];
@@ -155,23 +150,15 @@ void LocationAllocator::bind_uniform(RefPtr<Layout> &layout, const string &name,
                while(used.count(bind_point))
                        bind_point = (bind_point+1)%range;
 
-               add_layout_value(layout, "binding", bind_point);
+               add_layout_qualifier(layout, Layout::Qualifier("binding", bind_point));
                uniforms[name].bind_point = bind_point;
                used.insert(bind_point);
        }
 }
 
-void LocationAllocator::add_layout_value(RefPtr<Layout> &layout, const string &name, unsigned value)
-{
-       if(!layout)
-               layout = new Layout;
-
-       layout->qualifiers.push_back(Layout::Qualifier(name, value));
-}
-
 bool LocationAllocator::visit_uniform(const string &name, RefPtr<Layout> &layout)
 {
-       int bind_point = (layout ? get_layout_value(*layout, "binding") : -1);
+       int bind_point = get_layout_value(layout.get(), "binding");
        if(bind_point>=0)
        {
                used_bindings[0].insert(bind_point);
@@ -187,13 +174,13 @@ void LocationAllocator::visit(VariableDeclaration &var)
 
        if(!var.interface.empty())
        {
-               int location = (var.layout ? get_layout_value(*var.layout, "location") : -1);
+               int location = get_layout_value(var.layout.get(), "location");
 
                if(location<0 && var.linked_declaration && var.linked_declaration->layout)
                {
-                       location = get_layout_value(*var.linked_declaration->layout, "location");
+                       location = get_layout_value(var.linked_declaration->layout.get(), "location");
                        if(location>=0)
-                               add_layout_value(var.layout, "location", location);
+                               add_layout_qualifier(var.layout, Layout::Qualifier("location", location));
                }
 
                if(location>=0)
@@ -223,13 +210,7 @@ void LocationAllocator::visit(InterfaceBlock &iface)
 
        if(iface.interface=="uniform")
        {
-               bool push_constant = false;
-               if(iface.layout)
-               {
-                       auto i = find_member(iface.layout->qualifiers, string("push_constant"), &Layout::Qualifier::name);
-                       push_constant = (i!=iface.layout->qualifiers.end());
-               }
-
+               bool push_constant = has_layout_qualifier(iface.layout.get(), "push_constant");
                if(!push_constant && !visit_uniform(iface.block_name, iface.layout))
                        unbound_blocks.push_back(&iface);
        }
@@ -512,13 +493,7 @@ bool StructuralFeatureConverter::supports_interface_blocks(const string &iface)
 
 void StructuralFeatureConverter::visit(InterfaceBlock &iface)
 {
-       bool push_constant = false;
-       if(iface.layout)
-       {
-               auto i = find_member(iface.layout->qualifiers, string("push_constant"), &Layout::Qualifier::name);
-               push_constant = (i!=iface.layout->qualifiers.end());
-       }
-
+       bool push_constant = has_layout_qualifier(iface.layout.get(), "push_constant");
        if((!supports_interface_blocks(iface.interface) || (push_constant && features.target_api!=VULKAN)) && iface.type_declaration)
        {
                if(!iface.instance_name.empty())