X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=7f0d0b702d1ba3c75d2e3465308dc090bc83e6a0;hb=f7682c3c2e9f028cef6945ffbada66cff33585c0;hp=e12d0bfc6285c0fa65858f71fdb1d0cb0ad74025;hpb=86d5253cd89cf9a40aa43012c5d6ed03ba01ec6c;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index e12d0bfc..7f0d0b70 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -1582,16 +1582,6 @@ void SpirVGenerator::visit(StructDeclaration &strct)
 
 void SpirVGenerator::visit(VariableDeclaration &var)
 {
-	const vector<Layout::Qualifier> *layout_ql = (var.layout ? &var.layout->qualifiers : 0);
-
-	int spec_id = -1;
-	if(layout_ql)
-	{
-		auto i = find_member(*layout_ql, string("constant_id"), &Layout::Qualifier::name);
-		if(i!=layout_ql->end())
-			spec_id = i->value;
-	}
-
 	Id type_id = get_variable_type_id(var);
 	Id var_id;
 
@@ -1600,13 +1590,25 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 		if(!var.init_expression)
 			throw internal_error("const variable without initializer");
 
+		int spec_id = get_layout_value(var.layout.get(), "constant_id");
+		Id *spec_var_id = (spec_id>=0 ? &declared_spec_ids[spec_id] : 0);
+		if(spec_id>=0 && *spec_var_id)
+		{
+			insert_unique(declared_ids, &var, Declaration(*spec_var_id, type_id));
+			return;
+		}
+
 		SetFlag set_const(constant_expression);
 		SetFlag set_spec(spec_constant, spec_id>=0);
 		r_expression_result_id = 0;
 		var.init_expression->visit(*this);
 		var_id = r_expression_result_id;
 		insert_unique(declared_ids, &var, Declaration(var_id, type_id));
-		writer.write_op_decorate(var_id, DECO_SPEC_ID, spec_id);
+		if(spec_id>=0)
+		{
+			writer.write_op_decorate(var_id, DECO_SPEC_ID, spec_id);
+			*spec_var_id = var_id;
+		}
 
 		/* It's unclear what should be done if a specialization constant is
 		initialized with anything other than a literal.  GLSL doesn't seem to
@@ -1650,9 +1652,9 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 			writer.write(init_id);
 		writer.end_op(OP_VARIABLE);
 
-		if(layout_ql)
+		if(var.layout)
 		{
-			for(const Layout::Qualifier &q: *layout_ql)
+			for(const Layout::Qualifier &q: var.layout->qualifiers)
 			{
 				if(q.name=="location")
 					writer.write_op_decorate(var_id, DECO_LOCATION, q.value);
@@ -1680,7 +1682,9 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 
 void SpirVGenerator::visit(InterfaceBlock &iface)
 {
-	StorageClass storage = get_interface_storage(iface.interface, true);
+	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);
@@ -1708,9 +1712,13 @@ void SpirVGenerator::visit(InterfaceBlock &iface)
 
 	if(iface.layout)
 	{
-		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: 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);
+		}
 	}
 }
 
@@ -1856,6 +1864,8 @@ void SpirVGenerator::visit(Conditional &cond)
 	writer.write_op(content.function_body, OP_SELECTION_MERGE, merge_block_id, 0);  // Selection control (none)
 	writer.write_op(content.function_body, OP_BRANCH_CONDITIONAL, r_expression_result_id, true_label_id, false_label_id);
 
+	std::map<const VariableDeclaration *, Id> saved_load_ids = variable_load_ids;
+
 	writer.write_op_label(true_label_id);
 	cond.body.visit(*this);
 	if(writer.get_current_block())
@@ -1866,6 +1876,7 @@ void SpirVGenerator::visit(Conditional &cond)
 	reachable = true;
 	if(!cond.else_body.body.empty())
 	{
+		swap(saved_load_ids, variable_load_ids);
 		writer.write_op_label(false_label_id);
 		cond.else_body.visit(*this);
 		reachable |= reachable_if_true;