From eaff1030de07f3739794207403ea833ee91c0034 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 19 May 2021 21:58:32 -0400
Subject: glsl: Initial backend

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
new file mode 100644
index 000000000..ffc97007d
--- /dev/null
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -0,0 +1,62 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <utility>
+#include <fmt/format.h>
+
+#include "shader_recompiler/backend/glsl/reg_alloc.h"
+#include "shader_recompiler/stage.h"
+
+namespace Shader {
+struct Info;
+struct Profile;
+} // namespace Shader
+
+namespace Shader::Backend {
+struct Bindings;
+}
+
+namespace Shader::IR {
+class Inst;
+struct Program;
+} // namespace Shader::IR
+
+namespace Shader::Backend::GLSL {
+
+class EmitContext {
+public:
+    explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_);
+
+    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)...);
+        // 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)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
+    std::string AllocVar() {
+        return fmt::format("var_{}", var_num++);
+    }
+
+    std::string code;
+    RegAlloc reg_alloc;
+    const Info& info;
+    const Profile& profile;
+    u64 var_num{};
+
+private:
+    void DefineConstantBuffers();
+};
+
+} // namespace Shader::Backend::GLSL
-- 
cgit v1.2.3


From 64337f004d9249c4408fec75bd1bbcc0f2a1408d Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 20 May 2021 23:38:38 -0400
Subject: glsl: Fix "reg" allocing

based on glasm with some tweaks
---
 src/shader_recompiler/backend/glsl/emit_context.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index ffc97007d..8d093a853 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -45,18 +45,14 @@ public:
         code += '\n';
     }
 
-    std::string AllocVar() {
-        return fmt::format("var_{}", var_num++);
-    }
-
     std::string code;
     RegAlloc reg_alloc;
     const Info& info;
     const Profile& profile;
-    u64 var_num{};
 
 private:
     void DefineConstantBuffers();
+    void DefineStorageBuffers();
 };
 
 } // namespace Shader::Backend::GLSL
-- 
cgit v1.2.3


From e221baccddea3c0802c97e7f6f60c0c3e6a72b60 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 21 May 2021 02:00:12 -0400
Subject: glsl: Reusable typed variables. IADD32

---
 src/shader_recompiler/backend/glsl/emit_context.h | 28 +++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 8d093a853..81b970c14 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -31,9 +31,33 @@ class EmitContext {
 public:
     explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_);
 
+    // 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)...);
+    //     // TODO: Remove this
+    //     code += '\n';
+    // }
+
+    template <typename... Args>
+    void AddU32(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code +=
+            fmt::format(format_str, reg_alloc.Define(inst, Type::U32), std::forward<Args>(args)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
+    template <typename... Args>
+    void AddS32(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code +=
+            fmt::format(format_str, reg_alloc.Define(inst, Type::S32), std::forward<Args>(args)...);
+        // TODO: Remove this
+        code += '\n';
+    }
+
     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)...);
+    void AddF32(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code +=
+            fmt::format(format_str, reg_alloc.Define(inst, Type::F32), std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
-- 
cgit v1.2.3


From 0f40b0e61ccc04216e0840e092dfe3051716b8b6 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 21 May 2021 20:56:46 -0400
Subject: glsl: Implement a few Integer instructions

---
 src/shader_recompiler/backend/glsl/emit_context.h | 43 ++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 81b970c14..f8cf8fdbc 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -38,28 +38,46 @@ public:
     //     code += '\n';
     // }
 
-    template <typename... Args>
-    void AddU32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code +=
-            fmt::format(format_str, reg_alloc.Define(inst, Type::U32), std::forward<Args>(args)...);
+    template <Type type, typename... Args>
+    void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
+        code += fmt::format(format_str, reg_alloc.Define(inst, type), std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
 
+    template <typename... Args>
+    void AddU1(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U1>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddU32(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U32>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void AddS32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code +=
-            fmt::format(format_str, reg_alloc.Define(inst, Type::S32), std::forward<Args>(args)...);
-        // TODO: Remove this
-        code += '\n';
+        Add<Type::S32>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code +=
-            fmt::format(format_str, reg_alloc.Define(inst, Type::F32), std::forward<Args>(args)...);
-        // TODO: Remove this
-        code += '\n';
+        Add<Type::F32>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddU64(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U64>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddU32x2(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U32x2>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddF32x2(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::F32x2>(format_str, inst, args...);
     }
 
     template <typename... Args>
@@ -75,6 +93,7 @@ public:
     const Profile& profile;
 
 private:
+    void SetupExtensions(std::string& header);
     void DefineConstantBuffers();
     void DefineStorageBuffers();
 };
-- 
cgit v1.2.3


From 5e9095ef2203e7cddcaba84fa3b01cc0d940b634 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sat, 22 May 2021 01:52:03 -0400
Subject: glsl: Add many FP32/64 instructions

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index f8cf8fdbc..9472f71b9 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -65,11 +65,21 @@ public:
         Add<Type::F32>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddS64(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::S64>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void AddU64(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<Type::U64>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddF64(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::F64>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void AddU32x2(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<Type::U32x2>(format_str, inst, args...);
-- 
cgit v1.2.3


From 3d9ecbe99844c44074c26f2db4db376059f50534 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Mon, 24 May 2021 18:35:37 -0400
Subject: glsl: Wip storage atomic ops

---
 src/shader_recompiler/backend/glsl/emit_context.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 9472f71b9..ca5657fe7 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -31,13 +31,6 @@ class EmitContext {
 public:
     explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_);
 
-    // 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)...);
-    //     // TODO: Remove this
-    //     code += '\n';
-    // }
-
     template <Type type, typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
         code += fmt::format(format_str, reg_alloc.Define(inst, type), std::forward<Args>(args)...);
@@ -106,6 +99,7 @@ private:
     void SetupExtensions(std::string& header);
     void DefineConstantBuffers();
     void DefineStorageBuffers();
+    void DefineHelperFunctions();
 };
 
 } // namespace Shader::Backend::GLSL
-- 
cgit v1.2.3


From 9cc1b8a873196dac5a97368df125816b5b195777 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 25 May 2021 01:52:02 -0400
Subject: glsl: F16x2 storage atomics

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index ca5657fe7..7f8857fa7 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -43,6 +43,11 @@ public:
         Add<Type::U1>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddF16x2(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::F16x2>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void AddU32(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<Type::U32>(format_str, inst, args...);
-- 
cgit v1.2.3


From 3d086e6130a2c5f0546ccef3b234c65ef2f0c99b Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 26 May 2021 00:16:20 -0400
Subject: glsl: Implement some attribute getters and setters

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 7f8857fa7..087eaff6a 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -88,6 +88,11 @@ public:
         Add<Type::F32x2>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddF32x4(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::F32x4>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void Add(const char* format_str, Args&&... args) {
         code += fmt::format(format_str, std::forward<Args>(args)...);
@@ -100,6 +105,10 @@ public:
     const Info& info;
     const Profile& profile;
 
+    Stage stage{};
+    std::string_view stage_name = "invalid";
+    std::string_view attrib_name = "invalid";
+
 private:
     void SetupExtensions(std::string& header);
     void DefineConstantBuffers();
-- 
cgit v1.2.3


From d171083d53e106c8c5131522fdc81d51360c562d Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 26 May 2021 21:18:17 -0400
Subject: glsl: textures wip

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 087eaff6a..1cd051b24 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -6,6 +6,8 @@
 
 #include <string>
 #include <utility>
+#include <vector>
+
 #include <fmt/format.h>
 
 #include "shader_recompiler/backend/glsl/reg_alloc.h"
@@ -109,11 +111,17 @@ public:
     std::string_view stage_name = "invalid";
     std::string_view attrib_name = "invalid";
 
+    std::vector<u32> texture_buffer_bindings;
+    std::vector<u32> image_buffer_bindings;
+    std::vector<u32> texture_bindings;
+    std::vector<u32> image_bindings;
+
 private:
     void SetupExtensions(std::string& header);
     void DefineConstantBuffers();
     void DefineStorageBuffers();
     void DefineHelperFunctions();
+    void SetupImages(Bindings& bindings);
 };
 
 } // namespace Shader::Backend::GLSL
-- 
cgit v1.2.3


From ed14d31f663e126a8f9fe0ea8abff8e27c46248b Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 27 May 2021 00:26:16 -0400
Subject: glsl: Fix non-immediate buffer access

and many other misc implementations
---
 src/shader_recompiler/backend/glsl/emit_context.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 1cd051b24..66f70d355 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -90,6 +90,21 @@ public:
         Add<Type::F32x2>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddU32x3(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U32x3>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddF32x3(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::F32x3>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddU32x4(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<Type::U32x4>(format_str, inst, args...);
+    }
+
     template <typename... Args>
     void AddF32x4(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<Type::F32x4>(format_str, inst, args...);
-- 
cgit v1.2.3


From a752ec88d06c6bcfb13605447a164c6b6915ed6e Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 27 May 2021 20:31:03 -0400
Subject: glsl: Implement derivatives and YDirection

plus some other misc additions/changed
---
 src/shader_recompiler/backend/glsl/emit_context.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 66f70d355..07dad6e57 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/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::GLSL {
 
 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 <Type type, typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
@@ -121,6 +123,7 @@ public:
     RegAlloc reg_alloc;
     const Info& info;
     const Profile& profile;
+    const RuntimeInfo& runtime_info;
 
     Stage stage{};
     std::string_view stage_name = "invalid";
@@ -131,6 +134,8 @@ public:
     std::vector<u32> texture_bindings;
     std::vector<u32> image_bindings;
 
+    bool uses_y_direction{};
+
 private:
     void SetupExtensions(std::string& header);
     void DefineConstantBuffers();
-- 
cgit v1.2.3


From 2a713337165df4d5c4228458999a680e9ab65369 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 27 May 2021 22:28:33 -0400
Subject: glsl: Fix bindings, add some CC ops

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 07dad6e57..9dff921db 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -127,7 +127,6 @@ public:
 
     Stage stage{};
     std::string_view stage_name = "invalid";
-    std::string_view attrib_name = "invalid";
 
     std::vector<u32> texture_buffer_bindings;
     std::vector<u32> image_buffer_bindings;
@@ -138,8 +137,8 @@ public:
 
 private:
     void SetupExtensions(std::string& header);
-    void DefineConstantBuffers();
-    void DefineStorageBuffers();
+    void DefineConstantBuffers(Bindings& bindings);
+    void DefineStorageBuffers(Bindings& bindings);
     void DefineHelperFunctions();
     void SetupImages(Bindings& bindings);
 };
-- 
cgit v1.2.3


From f6bbc76336942454a862280e5b2158ceab49a173 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 28 May 2021 13:54:09 -0400
Subject: glsl: WIP var forward declaration

to fix Loop control flow.
---
 src/shader_recompiler/backend/glsl/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 9dff921db..c9d629c40 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -119,6 +119,7 @@ public:
         code += '\n';
     }
 
+    std::string header;
     std::string code;
     RegAlloc reg_alloc;
     const Info& info;
-- 
cgit v1.2.3


From 1542f31e7979a7bae465d299774268533a130f9b Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sat, 29 May 2021 20:00:06 -0400
Subject: glsl: minor cleanup

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index c9d629c40..7ae7c8766 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -135,6 +135,7 @@ public:
     std::vector<u32> image_bindings;
 
     bool uses_y_direction{};
+    bool uses_cc_carry{};
 
 private:
     void SetupExtensions(std::string& header);
-- 
cgit v1.2.3


From 1269a0cf8b3844c1a9bb06c843a7698b0a9643d5 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 30 May 2021 17:27:00 -0400
Subject: glsl: Rework variable allocator to allow for variable reuse

---
 src/shader_recompiler/backend/glsl/emit_context.h | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 7ae7c8766..2f1062954 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -10,7 +10,7 @@
 
 #include <fmt/format.h>
 
-#include "shader_recompiler/backend/glsl/reg_alloc.h"
+#include "shader_recompiler/backend/glsl/var_alloc.h"
 #include "shader_recompiler/stage.h"
 
 namespace Shader {
@@ -35,81 +35,81 @@ public:
     explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_,
                          const RuntimeInfo& runtime_info_);
 
-    template <Type type, typename... Args>
+    template <GlslVarType type, typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code += fmt::format(format_str, reg_alloc.Define(inst, type), std::forward<Args>(args)...);
+        code += fmt::format(format_str, var_alloc.Define(inst, type), std::forward<Args>(args)...);
         // TODO: Remove this
         code += '\n';
     }
 
     template <typename... Args>
     void AddU1(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U1>(format_str, inst, args...);
+        Add<GlslVarType::U1>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF16x2(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F16x2>(format_str, inst, args...);
+        Add<GlslVarType::F16x2>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddU32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U32>(format_str, inst, args...);
+        Add<GlslVarType::U32>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddS32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::S32>(format_str, inst, args...);
+        Add<GlslVarType::S32>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F32>(format_str, inst, args...);
+        Add<GlslVarType::F32>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddS64(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::S64>(format_str, inst, args...);
+        Add<GlslVarType::S64>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddU64(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U64>(format_str, inst, args...);
+        Add<GlslVarType::U64>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF64(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F64>(format_str, inst, args...);
+        Add<GlslVarType::F64>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddU32x2(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U32x2>(format_str, inst, args...);
+        Add<GlslVarType::U32x2>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF32x2(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F32x2>(format_str, inst, args...);
+        Add<GlslVarType::F32x2>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddU32x3(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U32x3>(format_str, inst, args...);
+        Add<GlslVarType::U32x3>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF32x3(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F32x3>(format_str, inst, args...);
+        Add<GlslVarType::F32x3>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddU32x4(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::U32x4>(format_str, inst, args...);
+        Add<GlslVarType::U32x4>(format_str, inst, args...);
     }
 
     template <typename... Args>
     void AddF32x4(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<Type::F32x4>(format_str, inst, args...);
+        Add<GlslVarType::F32x4>(format_str, inst, args...);
     }
 
     template <typename... Args>
@@ -121,7 +121,7 @@ public:
 
     std::string header;
     std::string code;
-    RegAlloc reg_alloc;
+    VarAlloc var_alloc;
     const Info& info;
     const Profile& profile;
     const RuntimeInfo& runtime_info;
-- 
cgit v1.2.3


From 9f3ffb996b0d02ca64b492d22ff158e8f3659257 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 30 May 2021 19:13:22 -0400
Subject: glsl: Rework var alloc to not assign unused results

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 2f1062954..423fc6104 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -37,7 +37,13 @@ public:
 
     template <GlslVarType type, typename... Args>
     void Add(const char* format_str, IR::Inst& inst, Args&&... args) {
-        code += fmt::format(format_str, var_alloc.Define(inst, type), std::forward<Args>(args)...);
+        const auto var_def{var_alloc.AddDefine(inst, type)};
+        if (var_def.empty()) {
+            // skip assigment.
+            code += fmt::format(&format_str[3], std::forward<Args>(args)...);
+        } else {
+            code += fmt::format(format_str, var_def, std::forward<Args>(args)...);
+        }
         // TODO: Remove this
         code += '\n';
     }
-- 
cgit v1.2.3


From e10366974edd7c75111d0bef16daf941db9e9a30 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 30 May 2021 22:44:28 -0400
Subject: glsl: Implement precise fp variable allocation

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 423fc6104..48786a2c7 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -118,6 +118,16 @@ public:
         Add<GlslVarType::F32x4>(format_str, inst, args...);
     }
 
+    template <typename... Args>
+    void AddPrecF32(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<GlslVarType::PrecF32>(format_str, inst, args...);
+    }
+
+    template <typename... Args>
+    void AddPrecF64(const char* format_str, IR::Inst& inst, Args&&... args) {
+        Add<GlslVarType::PrecF64>(format_str, inst, args...);
+    }
+
     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 f4799e8fa15b92d8d5607dc5dfca4974901ee06c Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 2 Jun 2021 00:33:03 -0400
Subject: glsl: Implement transform feedback

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 48786a2c7..5d48675e6 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -30,6 +30,12 @@ struct Program;
 
 namespace Shader::Backend::GLSL {
 
+struct GenericElementInfo {
+    std::string name{};
+    u32 first_element{};
+    u32 num_components{};
+};
+
 class EmitContext {
 public:
     explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_,
@@ -149,6 +155,7 @@ public:
     std::vector<u32> image_buffer_bindings;
     std::vector<u32> texture_bindings;
     std::vector<u32> image_bindings;
+    std::array<std::array<GenericElementInfo, 4>, 32> output_generics{};
 
     bool uses_y_direction{};
     bool uses_cc_carry{};
@@ -157,6 +164,7 @@ private:
     void SetupExtensions(std::string& header);
     void DefineConstantBuffers(Bindings& bindings);
     void DefineStorageBuffers(Bindings& bindings);
+    void DefineGenericOutput(size_t index, u32 invocations);
     void DefineHelperFunctions();
     void SetupImages(Bindings& bindings);
 };
-- 
cgit v1.2.3


From 6577a63d368afa57d5f29df40e524af30eaabffa Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 2 Jun 2021 00:48:49 -0400
Subject: glsl: skip gl_ViewportIndex write if device does not support it

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 5d48675e6..26a76f8a3 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -159,6 +159,7 @@ public:
 
     bool uses_y_direction{};
     bool uses_cc_carry{};
+    bool supports_viewport_layer{};
 
 private:
     void SetupExtensions(std::string& header);
-- 
cgit v1.2.3


From 5355568a2dbbb5bc4122109e2bd04ce6903adff1 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 3 Jun 2021 20:24:56 -0400
Subject: glsl: Refactor Global memory functions

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 26a76f8a3..daca1b6f9 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -167,6 +167,7 @@ private:
     void DefineStorageBuffers(Bindings& bindings);
     void DefineGenericOutput(size_t index, u32 invocations);
     void DefineHelperFunctions();
+    std::string DefineGlobalMemoryFunctions();
     void SetupImages(Bindings& bindings);
 };
 
-- 
cgit v1.2.3


From 34fdb6471d6050b438fd53a0406aedbf6b690600 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 3 Jun 2021 20:57:52 -0400
Subject: glsl: Cleanup and address feedback

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index daca1b6f9..9bdca184f 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -31,7 +31,7 @@ struct Program;
 namespace Shader::Backend::GLSL {
 
 struct GenericElementInfo {
-    std::string name{};
+    std::string name;
     u32 first_element{};
     u32 num_components{};
 };
@@ -159,7 +159,6 @@ public:
 
     bool uses_y_direction{};
     bool uses_cc_carry{};
-    bool supports_viewport_layer{};
 
 private:
     void SetupExtensions(std::string& header);
@@ -169,6 +168,7 @@ private:
     void DefineHelperFunctions();
     std::string DefineGlobalMemoryFunctions();
     void SetupImages(Bindings& bindings);
+    void SetupTextures(Bindings& bindings);
 };
 
 } // namespace Shader::Backend::GLSL
-- 
cgit v1.2.3


From c5422041134ed2645e7cd32152e36f9d04c66da3 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Mon, 7 Jun 2021 20:39:30 -0400
Subject: glsl: Implement indexed attribute loads

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 9bdca184f..dce99586e 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -150,6 +150,7 @@ public:
 
     Stage stage{};
     std::string_view stage_name = "invalid";
+    std::string_view position_name = "gl_Position";
 
     std::vector<u32> texture_buffer_bindings;
     std::vector<u32> image_buffer_bindings;
-- 
cgit v1.2.3


From 8bb8bbf4ae2ef259857efe49436dfd71758ea092 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 8 Jun 2021 01:55:12 -0400
Subject: glsl: Implement fswzadd

and wip nv thread shuffle impl
---
 src/shader_recompiler/backend/glsl/emit_context.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index dce99586e..2b0d22ce5 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -167,6 +167,7 @@ private:
     void DefineStorageBuffers(Bindings& bindings);
     void DefineGenericOutput(size_t index, u32 invocations);
     void DefineHelperFunctions();
+    void DefineConstants();
     std::string DefineGlobalMemoryFunctions();
     void SetupImages(Bindings& bindings);
     void SetupTextures(Bindings& bindings);
-- 
cgit v1.2.3


From 4759db28d0b98c79f9a630b63ba13c4cd0df9109 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 11 Jun 2021 00:33:33 -0400
Subject: glsl: Address Rodrigo's feedback

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 2b0d22ce5..0d18abe90 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -46,7 +46,7 @@ public:
         const auto var_def{var_alloc.AddDefine(inst, type)};
         if (var_def.empty()) {
             // skip assigment.
-            code += fmt::format(&format_str[3], std::forward<Args>(args)...);
+            code += fmt::format(format_str + 3, std::forward<Args>(args)...);
         } else {
             code += fmt::format(format_str, var_def, std::forward<Args>(args)...);
         }
-- 
cgit v1.2.3


From 7d89a82a4891f78e2c068a24ad3bb56d74c92055 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 11 Jun 2021 00:41:28 -0400
Subject: glsl: Remove Signed Integer variables

---
 src/shader_recompiler/backend/glsl/emit_context.h | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 0d18abe90..9d8be0c9a 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -69,21 +69,11 @@ public:
         Add<GlslVarType::U32>(format_str, inst, args...);
     }
 
-    template <typename... Args>
-    void AddS32(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<GlslVarType::S32>(format_str, inst, args...);
-    }
-
     template <typename... Args>
     void AddF32(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<GlslVarType::F32>(format_str, inst, args...);
     }
 
-    template <typename... Args>
-    void AddS64(const char* format_str, IR::Inst& inst, Args&&... args) {
-        Add<GlslVarType::S64>(format_str, inst, args...);
-    }
-
     template <typename... Args>
     void AddU64(const char* format_str, IR::Inst& inst, Args&&... args) {
         Add<GlslVarType::U64>(format_str, inst, args...);
-- 
cgit v1.2.3


From e81c73a8748ccfcde56acfee5630116c3950e479 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 11 Jun 2021 02:50:30 -0400
Subject: glsl: Address more feedback. Implement indexed texture reads

---
 src/shader_recompiler/backend/glsl/emit_context.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 9d8be0c9a..685f56089 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -36,6 +36,11 @@ struct GenericElementInfo {
     u32 num_components{};
 };
 
+struct TextureImageDefinition {
+    u32 binding;
+    u32 count;
+};
+
 class EmitContext {
 public:
     explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_,
@@ -142,10 +147,10 @@ public:
     std::string_view stage_name = "invalid";
     std::string_view position_name = "gl_Position";
 
-    std::vector<u32> texture_buffer_bindings;
-    std::vector<u32> image_buffer_bindings;
-    std::vector<u32> texture_bindings;
-    std::vector<u32> image_bindings;
+    std::vector<TextureImageDefinition> texture_buffers;
+    std::vector<TextureImageDefinition> image_buffers;
+    std::vector<TextureImageDefinition> textures;
+    std::vector<TextureImageDefinition> images;
     std::array<std::array<GenericElementInfo, 4>, 32> output_generics{};
 
     bool uses_y_direction{};
-- 
cgit v1.2.3


From 6aa1bf7b6ff86bb7325e5b50709ddf5477b1e855 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sat, 12 Jun 2021 20:14:56 -0400
Subject: glsl: Implement legacy varyings

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 685f56089..8fa87c02c 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -157,7 +157,7 @@ public:
     bool uses_cc_carry{};
 
 private:
-    void SetupExtensions(std::string& header);
+    void SetupExtensions();
     void DefineConstantBuffers(Bindings& bindings);
     void DefineStorageBuffers(Bindings& bindings);
     void DefineGenericOutput(size_t index, u32 invocations);
-- 
cgit v1.2.3


From d36f667bc0adaa9f50d53efb4c908aadc38921a6 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 15 Jun 2021 17:23:57 -0400
Subject: glsl: Address rest of feedback

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 8fa87c02c..4a50556e1 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -136,6 +136,8 @@ public:
         code += '\n';
     }
 
+    [[nodiscard]] bool StageInitializesVaryings() const noexcept;
+
     std::string header;
     std::string code;
     VarAlloc var_alloc;
-- 
cgit v1.2.3


From 374eeda1a35f6a1dc81cf22122c701be68e89c0f Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 16 Jun 2021 04:59:30 -0300
Subject: shader: Properly manage attributes not written from previous stages

---
 src/shader_recompiler/backend/glsl/emit_context.h | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 4a50556e1..8fa87c02c 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -136,8 +136,6 @@ public:
         code += '\n';
     }
 
-    [[nodiscard]] bool StageInitializesVaryings() const noexcept;
-
     std::string header;
     std::string code;
     VarAlloc var_alloc;
-- 
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/glsl/emit_context.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index 8fa87c02c..ecdf6e5bc 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -153,6 +153,8 @@ public:
     std::vector<TextureImageDefinition> images;
     std::array<std::array<GenericElementInfo, 4>, 32> output_generics{};
 
+    u32 num_safety_loop_vars{};
+
     bool uses_y_direction{};
     bool uses_cc_carry{};
 
-- 
cgit v1.2.3


From f7352411f08c3a099b753d290540bb7c02fecac3 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:13:21 -0400
Subject: glsl: Add passthrough geometry shader support

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

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index ecdf6e5bc..dd7397489 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -157,6 +157,7 @@ public:
 
     bool uses_y_direction{};
     bool uses_cc_carry{};
+    bool uses_geometry_passthrough{};
 
 private:
     void SetupExtensions();
-- 
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/glsl/emit_context.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h
index dd7397489..d9b639d29 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.h
+++ b/src/shader_recompiler/backend/glsl/emit_context.h
@@ -51,9 +51,9 @@ public:
         const auto var_def{var_alloc.AddDefine(inst, type)};
         if (var_def.empty()) {
             // skip assigment.
-            code += fmt::format(format_str + 3, std::forward<Args>(args)...);
+            code += fmt::format(fmt::runtime(format_str + 3), std::forward<Args>(args)...);
         } else {
-            code += fmt::format(format_str, var_def, std::forward<Args>(args)...);
+            code += fmt::format(fmt::runtime(format_str), var_def, std::forward<Args>(args)...);
         }
         // TODO: Remove this
         code += '\n';
@@ -131,7 +131,7 @@ public:
 
     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