From 4dea96e285c123aab7d2c849ea3deaf512c3689c Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 8 Nov 2021 15:23:23 +0200 Subject: [PATCH] Restore variable load IDs for the else branch of a conditional --- source/glsl/spirv.cpp | 3 +++ 1 file changed, 3 insertions(+) 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 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; -- 2.43.0