From b10cf64c486d8730fcfeb53a333814915b3b5fbe Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 5 May 2021 02:19:08 -0300
Subject: glasm: Add GLASM backend infrastructure

---
 src/shader_recompiler/backend/glasm/emit_context.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/shader_recompiler/backend/glasm/emit_context.h

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
new file mode 100644
index 000000000..ae91069c8
--- /dev/null
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -0,0 +1,21 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "shader_recompiler/backend/glasm/reg_alloc.h"
+
+namespace Shader::Backend::GLASM {
+
+class EmitContext {
+public:
+    std::string code;
+    RegAlloc reg_alloc;
+
+private:
+};
+
+} // namespace Shader::Backend::GLASM
-- 
cgit v1.2.3


From c1ba685d9c9b9ca9e8c479c52097adf943e804eb Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 7 May 2021 06:31:30 -0300
Subject: glasm: Changes to GLASM register allocator and emit context

---
 src/shader_recompiler/backend/glasm/emit_context.h | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index ae91069c8..cf66619de 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -5,17 +5,38 @@
 #pragma once
 
 #include <string>
+#include <utility>
+
+#include <fmt/format.h>
 
 #include "shader_recompiler/backend/glasm/reg_alloc.h"
 
+namespace Shader::IR {
+class Inst;
+}
+
 namespace Shader::Backend::GLASM {
 
 class EmitContext {
 public:
-    std::string code;
-    RegAlloc reg_alloc;
+    explicit EmitContext();
 
-private:
+    template <typename... Args>
+    void Add(const char* fmt, IR::Inst& inst, Args&&... args) {
+        code += fmt::format(fmt, reg_alloc.Define(inst), std::forward<Args>(args)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
+    template <typename... Args>
+    void Add(const char* fmt, Args&&... args) {
+        code += fmt::format(fmt, std::forward<Args>(args)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
+    std::string code;
+    RegAlloc reg_alloc{*this};
 };
 
 } // namespace Shader::Backend::GLASM
-- 
cgit v1.2.3


From 6fd190d1ae4275a06ed2e488401e1d63912954be Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 8 May 2021 16:28:52 -0300
Subject: glasm: Implement basic GLASM instructions

---
 src/shader_recompiler/backend/glasm/emit_context.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index cf66619de..4f98a9816 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -13,13 +13,14 @@
 
 namespace Shader::IR {
 class Inst;
-}
+struct Program;
+} // namespace Shader::IR
 
 namespace Shader::Backend::GLASM {
 
 class EmitContext {
 public:
-    explicit EmitContext();
+    explicit EmitContext(IR::Program& program);
 
     template <typename... Args>
     void Add(const char* fmt, IR::Inst& inst, Args&&... args) {
-- 
cgit v1.2.3


From 1c9307969c4e3f6206947f1360acae33f95a4a86 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 9 May 2021 03:11:34 -0300
Subject: glasm: Make GLASM aware of types

---
 src/shader_recompiler/backend/glasm/emit_context.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 4f98a9816..a59acbf6c 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -23,15 +23,15 @@ public:
     explicit EmitContext(IR::Program& program);
 
     template <typename... Args>
-    void Add(const char* fmt, IR::Inst& inst, Args&&... args) {
-        code += fmt::format(fmt, reg_alloc.Define(inst), std::forward<Args>(args)...);
+    void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code += fmt::format(format_str, reg_alloc.Define(inst), std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
 
     template <typename... Args>
-    void Add(const char* fmt, Args&&... args) {
-        code += fmt::format(fmt, std::forward<Args>(args)...);
+    void Add(const char* format_str, Args&&... args) {
+        code += fmt::format(format_str, std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
-- 
cgit v1.2.3


From 4502595bc2518eecf934110e9393b11bf0c2f75a Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 9 May 2021 18:03:01 -0300
Subject: glasm: Initial GLASM fp64 support

---
 src/shader_recompiler/backend/glasm/emit_context.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index a59acbf6c..37663c1c8 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -29,6 +29,13 @@ public:
         code += '\n';
     }
 
+    template <typename... Args>
+    void LongAdd(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code += fmt::format(format_str, reg_alloc.LongDefine(inst), std::forward<Args>(args)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
     template <typename... Args>
     void Add(const char* format_str, Args&&... args) {
         code += fmt::format(format_str, std::forward<Args>(args)...);
-- 
cgit v1.2.3


From c4fd6b55bc9acd06b2fc89f84fd175d78e14110a Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 10 May 2021 18:21:28 -0300
Subject: glasm: Implement shuffle and vote instructions on GLASM

---
 src/shader_recompiler/backend/glasm/emit_context.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 37663c1c8..4efe42ada 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -45,6 +45,8 @@ public:
 
     std::string code;
     RegAlloc reg_alloc{*this};
+
+    std::string_view stage_name = "invalid";
 };
 
 } // namespace Shader::Backend::GLASM
-- 
cgit v1.2.3


From 8b7d5912d61d56f65fb7e3a03bba544a4c40bfa6 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 18 May 2021 21:04:09 -0300
Subject: glasm: Support textures used in more than one stage

---
 src/shader_recompiler/backend/glasm/emit_context.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 4efe42ada..084635c77 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -6,11 +6,20 @@
 
 #include <string>
 #include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 
 #include "shader_recompiler/backend/glasm/reg_alloc.h"
 
+namespace Shader {
+struct Info;
+}
+
+namespace Shader::Backend {
+struct Bindings;
+}
+
 namespace Shader::IR {
 class Inst;
 struct Program;
@@ -20,7 +29,7 @@ namespace Shader::Backend::GLASM {
 
 class EmitContext {
 public:
-    explicit EmitContext(IR::Program& program);
+    explicit EmitContext(IR::Program& program, Bindings& bindings);
 
     template <typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
@@ -45,6 +54,9 @@ public:
 
     std::string code;
     RegAlloc reg_alloc{*this};
+    const Info& info;
+
+    std::vector<u32> texture_bindings;
 
     std::string_view stage_name = "invalid";
 };
-- 
cgit v1.2.3


From 4a22942f452dd1bba5e10d20217a0bfbf214dacb Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 19 May 2021 02:05:24 -0300
Subject: glasm: Implement ImageFetch

---
 src/shader_recompiler/backend/glasm/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 084635c77..d6b0bf73c 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -56,6 +56,7 @@ public:
     RegAlloc reg_alloc{*this};
     const Info& info;
 
+    std::vector<u32> texture_buffer_bindings;
     std::vector<u32> texture_bindings;
 
     std::string_view stage_name = "invalid";
-- 
cgit v1.2.3


From accad56ee7cc9f77886d164701a35f1e89a3519b Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 19 May 2021 16:32:03 -0300
Subject: glasm: Implement stores to gl_ViewportIndex

---
 src/shader_recompiler/backend/glasm/emit_context.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index d6b0bf73c..dd1f9ac9f 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -11,10 +11,12 @@
 #include <fmt/format.h>
 
 #include "shader_recompiler/backend/glasm/reg_alloc.h"
+#include "shader_recompiler/stage.h"
 
 namespace Shader {
 struct Info;
-}
+struct Profile;
+} // namespace Shader
 
 namespace Shader::Backend {
 struct Bindings;
@@ -29,7 +31,7 @@ namespace Shader::Backend::GLASM {
 
 class EmitContext {
 public:
-    explicit EmitContext(IR::Program& program, Bindings& bindings);
+    explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_);
 
     template <typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
@@ -55,10 +57,12 @@ public:
     std::string code;
     RegAlloc reg_alloc{*this};
     const Info& info;
+    const Profile& profile;
 
     std::vector<u32> texture_buffer_bindings;
     std::vector<u32> texture_bindings;
 
+    Stage stage{};
     std::string_view stage_name = "invalid";
 };
 
-- 
cgit v1.2.3


From dadd192b30d547dfa078057796a5ae16820eb4be Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 20 May 2021 02:18:52 -0300
Subject: glasm: Implement ImageRead

---
 src/shader_recompiler/backend/glasm/emit_context.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index dd1f9ac9f..d5bab48ea 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -60,7 +60,9 @@ public:
     const Profile& profile;
 
     std::vector<u32> texture_buffer_bindings;
+    std::vector<u32> image_buffer_bindings;
     std::vector<u32> texture_bindings;
+    std::vector<u32> image_bindings;
 
     Stage stage{};
     std::string_view stage_name = "invalid";
-- 
cgit v1.2.3


From 83cef0426b058014ad94dd687a29e7c31a1fbbef Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 20 May 2021 17:28:09 -0300
Subject: glasm: Properly declare attributes on geometry programs

---
 src/shader_recompiler/backend/glasm/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index d5bab48ea..e76ed1d7c 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -66,6 +66,7 @@ public:
 
     Stage stage{};
     std::string_view stage_name = "invalid";
+    std::string_view attrib_name = "invalid";
 };
 
 } // namespace Shader::Backend::GLASM
-- 
cgit v1.2.3


From 9e7b6622c25aa858b96bf0f1c7f94223a2f449a2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 21 May 2021 02:12:32 -0300
Subject: shader: Split profile and runtime information in separate structs

---
 src/shader_recompiler/backend/glasm/emit_context.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index e76ed1d7c..1f057fdd5 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -16,6 +16,7 @@
 namespace Shader {
 struct Info;
 struct Profile;
+struct RuntimeInfo;
 } // namespace Shader
 
 namespace Shader::Backend {
@@ -31,7 +32,8 @@ namespace Shader::Backend::GLASM {
 
 class EmitContext {
 public:
-    explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_);
+    explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_,
+                         const RuntimeInfo& runtime_info_);
 
     template <typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
@@ -56,8 +58,8 @@ public:
 
     std::string code;
     RegAlloc reg_alloc{*this};
-    const Info& info;
     const Profile& profile;
+    const RuntimeInfo& runtime_info;
 
     std::vector<u32> texture_buffer_bindings;
     std::vector<u32> image_buffer_bindings;
-- 
cgit v1.2.3


From e30d4fa976f608a79629e12cac25f7b951e6b8fb Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 22 May 2021 18:29:43 -0300
Subject: glasm: Implement indirect attribute loads

---
 src/shader_recompiler/backend/glasm/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 1f057fdd5..057d74790 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -58,6 +58,7 @@ public:
 
     std::string code;
     RegAlloc reg_alloc{*this};
+    const Info& info;
     const Profile& profile;
     const RuntimeInfo& runtime_info;
 
-- 
cgit v1.2.3


From f58f79c85dad7ad018a015cc6913f2789540ec22 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 26 May 2021 16:00:36 -0300
Subject: glasm: Implement Y direction

---
 src/shader_recompiler/backend/glasm/emit_context.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 057d74790..cd4213cb7 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -70,6 +70,8 @@ public:
     Stage stage{};
     std::string_view stage_name = "invalid";
     std::string_view attrib_name = "invalid";
+
+    bool uses_y_direction{};
 };
 
 } // namespace Shader::Backend::GLASM
-- 
cgit v1.2.3


From 808ef97a086e7cc58a3ceded1de516ad6a6be5d3 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 21 Jun 2021 01:07:10 -0300
Subject: shader: Move loop safety tests to code emission

---
 src/shader_recompiler/backend/glasm/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index cd4213cb7..9f86e55d3 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -71,6 +71,7 @@ public:
     std::string_view stage_name = "invalid";
     std::string_view attrib_name = "invalid";
 
+    u32 num_safety_loop_vars{};
     bool uses_y_direction{};
 };
 
-- 
cgit v1.2.3


From 2e5af95541adf581364ee3864be57f9b2b9a230f Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 28 Jun 2021 23:44:03 -0400
Subject: shader: GCC fmt 8.0.0 fixes

---
 src/shader_recompiler/backend/glasm/emit_context.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 9f86e55d3..1da51a996 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -37,21 +37,23 @@ public:
 
     template <typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code += fmt::format(format_str, reg_alloc.Define(inst), std::forward<Args>(args)...);
+        code += fmt::format(fmt::runtime(format_str), reg_alloc.Define(inst),
+                            std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
 
     template <typename... Args>
     void LongAdd(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code += fmt::format(format_str, reg_alloc.LongDefine(inst), std::forward<Args>(args)...);
+        code += fmt::format(fmt::runtime(format_str), reg_alloc.LongDefine(inst),
+                            std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
 
     template <typename... Args>
     void Add(const char* format_str, Args&&... args) {
-        code += fmt::format(format_str, std::forward<Args>(args)...);
+        code += fmt::format(fmt::runtime(format_str), std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
-- 
cgit v1.2.3


From 49946cf780c317b4c5ccabb52ec433eba01c1970 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 11 Jul 2021 22:10:38 -0400
Subject: shader_recompiler, video_core: Resolve clang errors

Silences the following warnings-turned-errors:
-Wsign-conversion
-Wunused-private-field
-Wbraced-scalar-init
-Wunused-variable

And some other errors
---
 src/shader_recompiler/backend/glasm/emit_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/shader_recompiler/backend/glasm/emit_context.h')

diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h
index 1da51a996..8433e5c00 100644
--- a/src/shader_recompiler/backend/glasm/emit_context.h
+++ b/src/shader_recompiler/backend/glasm/emit_context.h
@@ -59,7 +59,7 @@ public:
     }
 
     std::string code;
-    RegAlloc reg_alloc{*this};
+    RegAlloc reg_alloc{};
     const Info& info;
     const Profile& profile;
     const RuntimeInfo& runtime_info;
-- 
cgit v1.2.3