X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=4dceb9719a638c8ba6048b1a3509eb5b8555046c;hb=refs%2Fheads%2Fmaster;hp=1fc9799ff6418ee7b153610f47c71465fb53c876;hpb=e77f248bcd1d8126c392451e6057417e74aef05f;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 1fc9799f..4dceb971 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -917,9 +917,10 @@ void SpirVGenerator::visit(BinaryExpression &binary)
 
 				compare_id = write_construct(bool_vec_type_id, column_ids, n_elems);
 			}
+			else
+				throw internal_error("unsupported types for non-scalar equality comparison");
 
-			if(compare_id)
-				r_expression_result_id = write_expression(combine_op, result_type_id, compare_id);
+			r_expression_result_id = write_expression(combine_op, result_type_id, compare_id);
 			return;
 		}
 	}
@@ -1605,6 +1606,7 @@ void SpirVGenerator::visit(ImageTypeDeclaration &image)
 		return;
 
 	Id type_id = allocate_id(image, 0);
+	SpirVFormat format = get_format(image.format);
 
 	Id image_id = (image.sampled ? next_id++ : type_id);
 	writer.begin_op(content.globals, OP_TYPE_IMAGE, 9);
@@ -1615,7 +1617,7 @@ void SpirVGenerator::visit(ImageTypeDeclaration &image)
 	writer.write(image.array);
 	writer.write(image.multisample);
 	writer.write(image.sampled ? 1 : 2);
-	writer.write(get_format(image.format));
+	writer.write(format);
 	writer.end_op(OP_TYPE_IMAGE);
 
 	if(image.sampled)
@@ -1632,6 +1634,9 @@ void SpirVGenerator::visit(ImageTypeDeclaration &image)
 
 	if(image.multisample && !image.sampled)
 		use_capability(CAP_STORAGE_IMAGE_MULTISAMPLE);
+
+	if(format>=FORMAT_RG32F && format<=FORMAT_R8_SNORM)
+		use_capability(CAP_STORAGE_IMAGE_EXTENDED_FORMATS);
 }
 
 void SpirVGenerator::visit(StructDeclaration &strct)
@@ -1790,7 +1795,7 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 			BuiltinSemantic semantic = get_builtin_semantic(var.name);
 			writer.write_op_decorate(var_id, DECO_BUILTIN, semantic);
 		}
-		if(var.sampling=="flat")
+		if(var.interpolation=="flat")
 			writer.write_op_decorate(var_id, DECO_FLAT);
 		if(var.sampling=="centroid")
 			writer.write_op_decorate(var_id, DECO_CENTROID);
@@ -1828,7 +1833,7 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 	for(Node *n: dependencies)
 		if(const VariableDeclaration *var = dynamic_cast<const VariableDeclaration *>(n))
 			if(!var->interface.empty())
-				writer.write(get_id(*n));
+				writer.write(allocate_forward_id(*n));
 
 	writer.end_op(OP_ENTRY_POINT);