From 9e6fe430bdc615ae5f7cc4fbc32d7e2baccd7ceb Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 4 Apr 2021 20:00:34 -0300
Subject: shader: Fix splits on blocks using indirect branches

---
 src/shader_recompiler/frontend/maxwell/control_flow.h | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/shader_recompiler/frontend/maxwell/control_flow.h')

diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.h b/src/shader_recompiler/frontend/maxwell/control_flow.h
index a8c90d27a..466b14198 100644
--- a/src/shader_recompiler/frontend/maxwell/control_flow.h
+++ b/src/shader_recompiler/frontend/maxwell/control_flow.h
@@ -79,18 +79,14 @@ struct Block : boost::intrusive::set_base_hook<
     Location begin;
     Location end;
     EndClass end_class;
-    Stack stack;
     IR::Condition cond;
-    union {
-        Block* branch_true;
-        FunctionId function_call;
-        IR::Reg branch_reg;
-    };
-    union {
-        Block* branch_false;
-        Block* return_block;
-        s32 branch_offset;
-    };
+    Stack stack;
+    Block* branch_true;
+    Block* branch_false;
+    FunctionId function_call;
+    Block* return_block;
+    IR::Reg branch_reg;
+    s32 branch_offset;
     std::vector<IndirectBranch> indirect_branches;
 };
 
-- 
cgit v1.2.3