X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=16168a8cb8725671197bf39567d276992e6c5695;hb=6f06479b765946bdd3174b2c05e7a1dda24c31c2;hp=1da748a64eb297f23f5f135aa3743af92eabbaea;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 1da748a6..16168a8c 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -132,20 +132,7 @@ const SpirVGenerator::BuiltinFunctionInfo SpirVGenerator::builtin_functions[] =
 };
 
 SpirVGenerator::SpirVGenerator():
-	stage(0),
-	current_function(0),
-	writer(content),
-	next_id(1),
-	r_expression_result_id(0),
-	constant_expression(false),
-	spec_constant(false),
-	reachable(false),
-	composite_access(false),
-	r_composite_base_id(0),
-	r_composite_base(0),
-	assignment_source_id(0),
-	loop_merge_block_id(0),
-	loop_continue_target_id(0)
+	writer(content)
 { }
 
 void SpirVGenerator::apply(Module &module)
@@ -583,7 +570,7 @@ void SpirVGenerator::generate_composite_access(TypeDeclaration &result_type)
 		throw internal_error("assignment to temporary composite");
 	else
 	{
-		for(unsigned i: r_composite_chain)
+		for(unsigned &i: r_composite_chain)
 			for(auto j=constant_ids.begin(); (i>=0x400000 && j!=constant_ids.end()); ++j)
 				if(j->second==(i&0x3FFFFF))
 					i = j->first.int_value;
@@ -1871,7 +1858,8 @@ void SpirVGenerator::visit(Iteration &iter)
 	if(iter.init_statement)
 		iter.init_statement->visit(*this);
 
-	variable_load_ids.clear();
+	for(VariableDeclaration *v: AssignmentCollector().apply(iter))
+		variable_load_ids.erase(v);
 
 	Id header_id = next_id++;
 	Id continue_id = next_id++;