X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.cpp;h=87e185024f3175c669a639dd14032b04e0cee79e;hb=2729c824049bd59c16370a60a90824a416755a62;hp=fb136e33c7dbc79fd03706ba6ef3450d4906fe5c;hpb=acd7bb6e23e2aff9934ecf32852c62ba72c13574;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index fb136e33..87e18502 100644
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -168,12 +168,11 @@ 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 desc_set = get_layout_value(layout.get(), "set");
 	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;
@@ -183,6 +182,11 @@ bool LocationAllocator::visit_uniform(const string &name, RefPtr<Layout> &layout
 		if(desc_set>=0)
 			uniforms[name].desc_set = desc_set;
 	}
+	else if(desc_set>=0 && bind_point<0)
+	{
+		auto i = find_member(layout->qualifiers, string("set"), &Layout::Qualifier::name);
+		layout->qualifiers.erase(i);
+	}
 
 	if(bind_point>=0)
 	{