X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=036446f5bab630d83613f7c97e774c3b1dd7bb30;hb=55e3f2d494d939280a4ea48676fd17ca2342b457;hp=70d5fe789f125ecd04e0e6bb89d58614f6b39b4c;hpb=584cf5e42c4758a3f4d197655d861d31ee23db4e;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 70d5fe78..036446f5 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -1177,7 +1177,7 @@ void SpirVGenerator::visit_constructor(FunctionCall &call, const vector<Id> &arg
 			Id zero_id = get_constant_id(get_id(elem), 0.0f);
 			for(unsigned i=0; i<n_columns; ++i)
 			{
-				column_ids[i] = begin_expression(OP_COMPOSITE_CONSTRUCT, col_type_id, n_rows);;
+				column_ids[i] = begin_expression(OP_COMPOSITE_CONSTRUCT, col_type_id, n_rows);
 				for(unsigned j=0; j<n_rows; ++j)
 					writer.write(j==i ? argument_ids[0] : zero_id);
 				end_expression(OP_COMPOSITE_CONSTRUCT);
@@ -1623,7 +1623,10 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 		}
 
 		if(init_id && current_function)
+		{
 			writer.write_op(content.function_body, OP_STORE, var_id, init_id);
+			variable_load_ids[&var] = init_id;
+		}
 	}
 
 	writer.write_op_name(var_id, var.name);
@@ -1832,6 +1835,8 @@ void SpirVGenerator::visit(Iteration &iter)
 	if(iter.init_statement)
 		iter.init_statement->visit(*this);
 
+	variable_load_ids.clear();
+
 	Id header_id = next_id++;
 	Id continue_id = next_id++;
 	Id merge_block_id = next_id++;
@@ -1859,7 +1864,6 @@ void SpirVGenerator::visit(Iteration &iter)
 	writer.write_op(content.function_body, OP_BRANCH, header_id);
 
 	writer.write_op_label(merge_block_id);
-	prune_loads(header_id);
 	reachable = true;
 }