X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=7b3e104e372c65a7d845bfd0a77c93358762aee3;hb=acd7bb6e23e2aff9934ecf32852c62ba72c13574;hp=4828a00c452ad1e35e54156f97dfaf2ef4a4ffd8;hpb=03b2ea5c9c611cfa5f02afb49ed7e05743e691b4;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 4828a00c..7b3e104e 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -375,17 +375,13 @@ SpirVGenerator::Id SpirVGenerator::get_variable_type_id(const VariableDeclaratio
 	if(const BasicTypeDeclaration *basic = dynamic_cast<const BasicTypeDeclaration *>(var.type_declaration))
 		if(basic->kind==BasicTypeDeclaration::ARRAY)
 		{
-			Id size_id = 0;
-			if(var.array_size)
-			{
-				SetFlag set_const(constant_expression);
-				r_expression_result_id = 0;
-				var.array_size->visit(*this);
-				size_id = r_expression_result_id;
-			}
-			else
-				size_id = get_constant_id(get_standard_type_id(BasicTypeDeclaration::INT, 1), 1);
-			return get_array_type_id(*basic->base_type, size_id, basic->extended_alignment);
+			if(!var.array_size)
+				throw logic_error("array without size");
+
+			SetFlag set_const(constant_expression);
+			r_expression_result_id = 0;
+			var.array_size->visit(*this);
+			return get_array_type_id(*basic->base_type, r_expression_result_id, basic->extended_alignment);
 		}
 
 	return get_id(*var.type_declaration);
@@ -1516,7 +1512,7 @@ void SpirVGenerator::visit(StructDeclaration &strct)
 		return;
 
 	Id type_id = allocate_id(strct, 0);
-	writer.write_op_name(type_id, strct.name);
+	writer.write_op_name(type_id, (strct.block_name.empty() ? strct.name : strct.block_name));
 
 	if(!strct.block_name.empty())
 		writer.write_op_decorate(type_id, DECO_BLOCK);
@@ -1674,7 +1670,8 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 		}
 	}
 
-	writer.write_op_name(var_id, var.name);
+	if(var.name.find(' ')==string::npos)
+		writer.write_op_name(var_id, var.name);
 }
 
 void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
@@ -1704,7 +1701,10 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 		writer.write_op(content.exec_modes, OP_EXECUTION_MODE, func_id, origin);
 	}
 	else if(stage->type==Stage::GEOMETRY)
+	{
 		use_capability(CAP_GEOMETRY);
+		writer.write_op(content.exec_modes, OP_EXECUTION_MODE, func_id, EXEC_INVOCATIONS, 1);
+	}
 
 	for(const InterfaceLayout *i: interface_layouts)
 	{
@@ -1780,6 +1780,7 @@ void SpirVGenerator::visit(FunctionDeclaration &func)
 	{
 		Id param_id = allocate_id(*func.parameters[i], param_type_ids[i]);
 		writer.write_op(content.functions, OP_FUNCTION_PARAMETER, param_type_ids[i], param_id);
+		writer.write_op_name(param_id, func.parameters[i]->name);
 		// TODO This is probably incorrect if the parameter is assigned to.
 		variable_load_ids[func.parameters[i].get()] = param_id;
 	}