From d54d7de40e7295827b0e4e4026441b53d3fc9569 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 14 May 2021 00:40:54 -0300
Subject: glasm: Rework control flow introducing a syntax list

This commit regresses VertexA shaders, their transformation pass has to
be adapted to the new control flow.
---
 .../frontend/ir/abstract_syntax_list.h             | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 src/shader_recompiler/frontend/ir/abstract_syntax_list.h

(limited to 'src/shader_recompiler/frontend/ir/abstract_syntax_list.h')

diff --git a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
new file mode 100644
index 000000000..1366414c2
--- /dev/null
+++ b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
@@ -0,0 +1,56 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+
+#include "shader_recompiler/frontend/ir/value.h"
+
+namespace Shader::IR {
+
+class Block;
+
+struct AbstractSyntaxNode {
+    enum class Type {
+        Block,
+        If,
+        EndIf,
+        Loop,
+        Repeat,
+        Break,
+        Return,
+        Unreachable,
+    };
+    Type type{};
+    union {
+        Block* block{};
+        struct {
+            U1 cond;
+            Block* body;
+            Block* merge;
+        } if_node;
+        struct {
+            Block* merge;
+        } end_if;
+        struct {
+            Block* body;
+            Block* continue_block;
+            Block* merge;
+        } loop;
+        struct {
+            U1 cond;
+            Block* loop_header;
+            Block* merge;
+        } repeat;
+        struct {
+            U1 cond;
+            Block* merge;
+            Block* skip;
+        } break_node;
+    };
+};
+using AbstractSyntaxList = std::vector<AbstractSyntaxNode>;
+
+} // namespace Shader::IR
-- 
cgit v1.2.3


From 776ab3ea12f07e2d434a26857d412cff018b1b50 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 15 May 2021 18:18:31 -0300
Subject: shader: Use a non-trivial dummy to construct ASL node union

---
 src/shader_recompiler/frontend/ir/abstract_syntax_list.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/shader_recompiler/frontend/ir/abstract_syntax_list.h')

diff --git a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
index 1366414c2..e9afb4d92 100644
--- a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
+++ b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
@@ -13,6 +13,10 @@ namespace Shader::IR {
 class Block;
 
 struct AbstractSyntaxNode {
+    struct NonTrivialDummy {
+        NonTrivialDummy() {}
+    };
+
     enum class Type {
         Block,
         If,
@@ -25,7 +29,8 @@ struct AbstractSyntaxNode {
     };
     Type type{};
     union {
-        Block* block{};
+        NonTrivialDummy dummy{};
+        Block* block;
         struct {
             U1 cond;
             Block* body;
-- 
cgit v1.2.3


From f7a2340205b4fa2db32403f20d7b7afe32b15f33 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 16 May 2021 17:06:13 -0400
Subject: shader_recompiler: GCC fixes

Fixes members of unnamed union not being accessible, and one function
without a declaration.
---
 src/shader_recompiler/frontend/ir/abstract_syntax_list.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/shader_recompiler/frontend/ir/abstract_syntax_list.h')

diff --git a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
index e9afb4d92..b61773487 100644
--- a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
+++ b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
@@ -13,10 +13,6 @@ namespace Shader::IR {
 class Block;
 
 struct AbstractSyntaxNode {
-    struct NonTrivialDummy {
-        NonTrivialDummy() {}
-    };
-
     enum class Type {
         Block,
         If,
@@ -27,9 +23,7 @@ struct AbstractSyntaxNode {
         Return,
         Unreachable,
     };
-    Type type{};
-    union {
-        NonTrivialDummy dummy{};
+    union Data {
         Block* block;
         struct {
             U1 cond;
@@ -55,6 +49,9 @@ struct AbstractSyntaxNode {
             Block* skip;
         } break_node;
     };
+
+    Data data{};
+    Type type{};
 };
 using AbstractSyntaxList = std::vector<AbstractSyntaxNode>;
 
-- 
cgit v1.2.3