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

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index e12d0bfc..609cdb19 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -1856,6 +1856,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 +1868,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;