Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index 7eb0165dc5b82156d6a71caca7953508ad74aa33..60312be8adf8fc09cdb6a55ed76de342b9f3da46 100644 (file)
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -62,8 +62,10 @@ void StructOrganizer::visit(VariableDeclaration &var)
 }
 
 
-void LocationAllocator::apply(Module &module, const Features &features)
+void LocationAllocator::apply(Module &module, const Features &f, bool a)
 {
+       features = f;
+       alloc_new = a;
        for(Stage &s: module.stages)
                apply(s);
 
@@ -111,6 +113,9 @@ void LocationAllocator::allocate_locations(const string &iface)
                        }
                }
 
+               if(!alloc_new)
+                       continue;
+
                set<unsigned> &used = used_locations[(*i)->interface];
 
                unsigned size = LocationCounter().apply(**i);
@@ -140,11 +145,16 @@ void LocationAllocator::allocate_locations(const string &iface)
 void LocationAllocator::bind_uniform(RefPtr<Layout> &layout, const string &name, unsigned range)
 {
        auto i = uniforms.find(name);
+
+       int desc_set = (i!=uniforms.end() ? i->second.desc_set : 0);
+       if(features.target_api==VULKAN && get_layout_value(layout.get(), "set")<0)
+               add_layout_qualifier(layout, Layout::Qualifier("set", desc_set));
+
        if(i!=uniforms.end() && i->second.bind_point>=0)
                add_layout_qualifier(layout, Layout::Qualifier("binding", i->second.bind_point));
-       else
+       else if(alloc_new)
        {
-               set<unsigned> &used = used_bindings[0];
+               set<unsigned> &used = used_bindings[desc_set];
 
                unsigned bind_point = fold32(hash64(name))%range;
                while(used.count(bind_point))
@@ -158,12 +168,28 @@ void LocationAllocator::bind_uniform(RefPtr<Layout> &layout, const string &name,
 
 bool LocationAllocator::visit_uniform(const string &name, RefPtr<Layout> &layout)
 {
+       int desc_set = 0;
        int bind_point = get_layout_value(layout.get(), "binding");
+
+       if(features.target_api==VULKAN)
+       {
+               desc_set = get_layout_value(layout.get(), "set");
+               if(desc_set<0 && bind_point>=0)
+               {
+                       desc_set = 0;
+                       add_layout_qualifier(layout, Layout::Qualifier("set", desc_set));
+               }
+
+               if(desc_set>=0)
+                       uniforms[name].desc_set = desc_set;
+       }
+
        if(bind_point>=0)
        {
-               used_bindings[0].insert(bind_point);
+               used_bindings[desc_set].insert(bind_point);
                uniforms[name].bind_point = bind_point;
        }
+
        return bind_point>=0;
 }