X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=20345e20ae0760de48e4bbea923e89fea7d9356b;hb=3fe1aab63922eec99d8bf6fd4fd60bec10df173c;hp=609cdb1968ac896627045cf8de82c61dd9284d15;hpb=4dea96e285c123aab7d2c849ea3deaf512c3689c;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 609cdb19..20345e20 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -1680,7 +1680,16 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 
 void SpirVGenerator::visit(InterfaceBlock &iface)
 {
-	StorageClass storage = get_interface_storage(iface.interface, true);
+	const vector<Layout::Qualifier> *layout_ql = (iface.layout ? &iface.layout->qualifiers : 0);
+
+	bool push_const = false;
+	if(layout_ql)
+	{
+		auto i = find_member(*layout_ql, string("push_constant"), &Layout::Qualifier::name);
+		push_const = (i!=layout_ql->end());
+	}
+
+	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);
@@ -1706,11 +1715,15 @@ void SpirVGenerator::visit(InterfaceBlock &iface)
 
 	writer.write_op(content.globals, OP_VARIABLE, ptr_type_id, block_id, storage);
 
-	if(iface.layout)
+	if(layout_ql)
 	{
-		auto i = find_member(iface.layout->qualifiers, string("binding"), &Layout::Qualifier::name);
-		if(i!=iface.layout->qualifiers.end())
-			writer.write_op_decorate(block_id, DECO_BINDING, i->value);
+		for(const Layout::Qualifier &q: *layout_ql)
+		{
+			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);
+		}
 	}
 }