From 9170200a11715d131645d1ffb92e86e6ef0d7e88 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 11 Feb 2021 16:39:06 -0300
Subject: shader: Initial implementation of an AST

---
 src/shader_recompiler/shader_info.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/shader_recompiler/shader_info.h

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
new file mode 100644
index 000000000..1760bf4a9
--- /dev/null
+++ b/src/shader_recompiler/shader_info.h
@@ -0,0 +1,28 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+
+#include <boost/container/static_vector.hpp>
+
+namespace Shader {
+
+struct Info {
+    struct ConstantBuffer {
+
+    };
+
+    struct {
+        bool workgroup_id{};
+        bool local_invocation_id{};
+        bool fp16{};
+        bool fp64{};
+    } uses;
+
+    std::array<18
+};
+
+} // namespace Shader
-- 
cgit v1.2.3


From b5d7279d878211654b4abb165d94af763a365f47 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 16 Feb 2021 04:10:22 -0300
Subject: spirv: Initial bindings support

---
 src/shader_recompiler/shader_info.h | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 1760bf4a9..f49a79368 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -6,23 +6,40 @@
 
 #include <array>
 
+#include "common/common_types.h"
+
 #include <boost/container/static_vector.hpp>
 
 namespace Shader {
 
 struct Info {
-    struct ConstantBuffer {
+    static constexpr size_t MAX_CBUFS{18};
+    static constexpr size_t MAX_SSBOS{16};
+
+    struct ConstantBufferDescriptor {
+        u32 index;
+        u32 count;
+    };
 
+    struct StorageBufferDescriptor {
+        u32 cbuf_index;
+        u32 cbuf_offset;
+        u32 count;
     };
 
-    struct {
-        bool workgroup_id{};
-        bool local_invocation_id{};
-        bool fp16{};
-        bool fp64{};
-    } uses;
+    bool uses_workgroup_id{};
+    bool uses_local_invocation_id{};
+    bool uses_fp16{};
+    bool uses_fp64{};
+
+    u32 constant_buffer_mask{};
+
+    std::array<ConstantBufferDescriptor*, MAX_CBUFS> constant_buffers{};
+    boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
+        constant_buffer_descriptors;
 
-    std::array<18
+    std::array<StorageBufferDescriptor*, MAX_SSBOS> storage_buffers{};
+    boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
 };
 
 } // namespace Shader
-- 
cgit v1.2.3


From e2bc05b17d91854cbb9c0ce3647141bf7d33143e Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 20 Feb 2021 03:30:13 -0300
Subject: shader: Add denorm flush support

---
 src/shader_recompiler/shader_info.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index f49a79368..8766bf13e 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -31,14 +31,15 @@ struct Info {
     bool uses_local_invocation_id{};
     bool uses_fp16{};
     bool uses_fp64{};
+    bool uses_fp16_denorms_flush{};
+    bool uses_fp16_denorms_preserve{};
+    bool uses_fp32_denorms_flush{};
+    bool uses_fp32_denorms_preserve{};
 
     u32 constant_buffer_mask{};
 
-    std::array<ConstantBufferDescriptor*, MAX_CBUFS> constant_buffers{};
     boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
         constant_buffer_descriptors;
-
-    std::array<StorageBufferDescriptor*, MAX_SSBOS> storage_buffers{};
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
 };
 
-- 
cgit v1.2.3


From ab463712474de5f99eec137a9c6233e55fe184f0 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 8 Mar 2021 18:31:53 -0300
Subject: shader: Initial support for textures and TEX

---
 src/shader_recompiler/shader_info.h | 52 +++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 11 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 8766bf13e..103a2f0b4 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -8,25 +8,51 @@
 
 #include "common/common_types.h"
 
+#include <boost/container/small_vector.hpp>
 #include <boost/container/static_vector.hpp>
 
 namespace Shader {
 
+enum class TextureType : u32 {
+    Color1D,
+    ColorArray1D,
+    Color2D,
+    ColorArray2D,
+    Color3D,
+    ColorCube,
+    ColorArrayCube,
+    Shadow1D,
+    ShadowArray1D,
+    Shadow2D,
+    ShadowArray2D,
+    Shadow3D,
+    ShadowCube,
+    ShadowArrayCube,
+};
+
+struct TextureDescriptor {
+    TextureType type;
+    u32 cbuf_index;
+    u32 cbuf_offset;
+    u32 count;
+};
+using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
+
+struct ConstantBufferDescriptor {
+    u32 index;
+    u32 count;
+};
+
+struct StorageBufferDescriptor {
+    u32 cbuf_index;
+    u32 cbuf_offset;
+    u32 count;
+};
+
 struct Info {
     static constexpr size_t MAX_CBUFS{18};
     static constexpr size_t MAX_SSBOS{16};
 
-    struct ConstantBufferDescriptor {
-        u32 index;
-        u32 count;
-    };
-
-    struct StorageBufferDescriptor {
-        u32 cbuf_index;
-        u32 cbuf_offset;
-        u32 count;
-    };
-
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
     bool uses_fp16{};
@@ -35,12 +61,16 @@ struct Info {
     bool uses_fp16_denorms_preserve{};
     bool uses_fp32_denorms_flush{};
     bool uses_fp32_denorms_preserve{};
+    bool uses_image_1d{};
+    bool uses_sampled_1d{};
+    bool uses_sparse_residency{};
 
     u32 constant_buffer_mask{};
 
     boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
         constant_buffer_descriptors;
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
+    TextureDescriptors texture_descriptors;
 };
 
 } // namespace Shader
-- 
cgit v1.2.3


From 3a63fa0477ea8297c80133d35494e1dfdc012f95 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 9 Mar 2021 17:14:57 -0300
Subject: shader: Partial implementation of LDC

---
 src/shader_recompiler/shader_info.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 103a2f0b4..adc1d9a64 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -7,6 +7,7 @@
 #include <array>
 
 #include "common/common_types.h"
+#include "shader_recompiler/frontend/ir/type.h"
 
 #include <boost/container/small_vector.hpp>
 #include <boost/container/static_vector.hpp>
@@ -61,10 +62,15 @@ struct Info {
     bool uses_fp16_denorms_preserve{};
     bool uses_fp32_denorms_flush{};
     bool uses_fp32_denorms_preserve{};
+    bool uses_int8{};
+    bool uses_int16{};
+    bool uses_int64{};
     bool uses_image_1d{};
     bool uses_sampled_1d{};
     bool uses_sparse_residency{};
 
+    IR::Type used_constant_buffer_types{};
+
     u32 constant_buffer_mask{};
 
     boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
-- 
cgit v1.2.3


From 260743f371236f7c57b01334b1c3474b15a47c39 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 19 Mar 2021 19:28:31 -0300
Subject: shader: Add partial rasterizer integration

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index adc1d9a64..6eff762e2 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -56,6 +56,15 @@ struct Info {
 
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
+
+    std::array<bool, 32> loads_generics{};
+    bool loads_position{};
+
+    std::array<bool, 8> stores_frag_color{};
+    bool stores_frag_depth{};
+    std::array<bool, 32> stores_generics{};
+    bool stores_position{};
+
     bool uses_fp16{};
     bool uses_fp64{};
     bool uses_fp16_denorms_flush{};
@@ -68,6 +77,7 @@ struct Info {
     bool uses_image_1d{};
     bool uses_sampled_1d{};
     bool uses_sparse_residency{};
+    bool uses_demote_to_helper_invocation{};
 
     IR::Type used_constant_buffer_types{};
 
-- 
cgit v1.2.3


From 76c8a962ac4eae77e71d66a72c448930240339f9 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 20 Mar 2021 19:11:56 -0300
Subject: spirv: Implement VertexId and InstanceId, refactor code

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 6eff762e2..f97730b34 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -59,6 +59,8 @@ struct Info {
 
     std::array<bool, 32> loads_generics{};
     bool loads_position{};
+    bool loads_instance_id{};
+    bool loads_vertex_id{};
 
     std::array<bool, 8> stores_frag_color{};
     bool stores_frag_depth{};
-- 
cgit v1.2.3


From 3d07cef009cf9e287744c7771c67166ef5761ce8 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 23 Mar 2021 20:27:17 -0400
Subject: shader: Implement VOTE

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index f97730b34..3d9f04d1a 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -80,6 +80,7 @@ struct Info {
     bool uses_sampled_1d{};
     bool uses_sparse_residency{};
     bool uses_demote_to_helper_invocation{};
+    bool uses_subgroup_vote{};
 
     IR::Type used_constant_buffer_types{};
 
-- 
cgit v1.2.3


From 32c5483beb2f79f5d55eb2906f2bfdfa1698bca3 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Thu, 25 Mar 2021 11:31:37 -0400
Subject: shader: Implement SHFL

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 3d9f04d1a..27e61a5f9 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -56,6 +56,7 @@ struct Info {
 
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
+    bool uses_subgroup_invocation_id{};
 
     std::array<bool, 32> loads_generics{};
     bool loads_position{};
-- 
cgit v1.2.3


From f0031babeb3ed04aef2468840aa37f4da13b2524 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 27 Mar 2021 02:55:37 -0300
Subject: shader: Implement front face

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 27e61a5f9..8ab66bb2a 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -62,6 +62,7 @@ struct Info {
     bool loads_position{};
     bool loads_instance_id{};
     bool loads_vertex_id{};
+    bool loads_front_face{};
 
     std::array<bool, 8> stores_frag_color{};
     bool stores_frag_depth{};
-- 
cgit v1.2.3


From dbd882ddeb1a1a9233c0085d0b8ccb022db385b2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 27 Mar 2021 04:59:58 -0300
Subject: shader: Better interpolation and disabled attributes support

---
 src/shader_recompiler/shader_info.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 8ab66bb2a..9111159f3 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -31,6 +31,17 @@ enum class TextureType : u32 {
     ShadowArrayCube,
 };
 
+enum class Interpolation {
+    Smooth,
+    Flat,
+    NoPerspective,
+};
+
+struct InputVarying {
+    Interpolation interpolation{Interpolation::Smooth};
+    bool used{false};
+};
+
 struct TextureDescriptor {
     TextureType type;
     u32 cbuf_index;
@@ -58,7 +69,7 @@ struct Info {
     bool uses_local_invocation_id{};
     bool uses_subgroup_invocation_id{};
 
-    std::array<bool, 32> loads_generics{};
+    std::array<InputVarying, 32> input_generics{};
     bool loads_position{};
     bool loads_instance_id{};
     bool loads_vertex_id{};
-- 
cgit v1.2.3


From 6c51f496320f698e123207c09ca61e55180a31b5 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 28 Mar 2021 22:23:45 -0400
Subject: shader: Implement FSWZADD

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 9111159f3..4b4006b7f 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -94,6 +94,7 @@ struct Info {
     bool uses_sparse_residency{};
     bool uses_demote_to_helper_invocation{};
     bool uses_subgroup_vote{};
+    bool uses_fswzadd{};
 
     IR::Type used_constant_buffer_types{};
 
-- 
cgit v1.2.3


From b7589fe1154d9e810e83f6c609dad1d646ec0359 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 26 Mar 2021 18:52:06 -0400
Subject: shader: Add PointSize attribute

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 4b4006b7f..3d8e08909 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -79,6 +79,7 @@ struct Info {
     bool stores_frag_depth{};
     std::array<bool, 32> stores_generics{};
     bool stores_position{};
+    bool stores_point_size{};
 
     bool uses_fp16{};
     bool uses_fp64{};
-- 
cgit v1.2.3


From 9d7422d967a97fea7888449652ad93da88e92b54 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Mon, 29 Mar 2021 20:05:38 +0200
Subject: shader: Add PointCoord attribute

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 3d8e08909..c9f6d9ef7 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -74,6 +74,7 @@ struct Info {
     bool loads_instance_id{};
     bool loads_vertex_id{};
     bool loads_front_face{};
+    bool loads_point_coord{};
 
     std::array<bool, 8> stores_frag_color{};
     bool stores_frag_depth{};
-- 
cgit v1.2.3


From 0c4cf3b9eb7de6624a844ae9ac9d2ba6b2ef3ac2 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Tue, 30 Mar 2021 21:52:06 +0200
Subject: shader: Implement ClipDistance

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index c9f6d9ef7..a62ad1e79 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -81,6 +81,7 @@ struct Info {
     std::array<bool, 32> stores_generics{};
     bool stores_position{};
     bool stores_point_size{};
+    bool stores_clip_distance{};
 
     bool uses_fp16{};
     bool uses_fp64{};
-- 
cgit v1.2.3


From d819ba4489b90955286341c739083e638173b938 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Thu, 1 Apr 2021 08:34:45 +0200
Subject: shader: Implement ViewportIndex

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index a62ad1e79..a5bff40bb 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -82,6 +82,7 @@ struct Info {
     bool stores_position{};
     bool stores_point_size{};
     bool stores_clip_distance{};
+    bool stores_viewport_index{};
 
     bool uses_fp16{};
     bool uses_fp64{};
-- 
cgit v1.2.3


From 12f5f320985824d1ebad587ebecb0f8406143ebc Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Thu, 1 Apr 2021 09:21:53 +0200
Subject: shader: Mark SSBOs as written when they are

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index a5bff40bb..d4d039eaf 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -59,6 +59,7 @@ struct StorageBufferDescriptor {
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
+    bool is_written;
 };
 
 struct Info {
-- 
cgit v1.2.3


From da6cf2632cd4dc0d2b0278353fcaee0789b418c0 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 4 Apr 2021 05:17:17 -0300
Subject: shader: Add subgroup masks

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d4d039eaf..9551a124f 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -99,6 +99,7 @@ struct Info {
     bool uses_sparse_residency{};
     bool uses_demote_to_helper_invocation{};
     bool uses_subgroup_vote{};
+    bool uses_subgroup_mask{};
     bool uses_fswzadd{};
 
     IR::Type used_constant_buffer_types{};
-- 
cgit v1.2.3


From 1d51803169f72f79e19995072fb9e8a371dbdcbf Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sun, 4 Apr 2021 06:47:14 +0200
Subject: shader: Implement indexed attributes

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 9551a124f..41bb5b9a1 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -76,6 +76,7 @@ struct Info {
     bool loads_vertex_id{};
     bool loads_front_face{};
     bool loads_point_coord{};
+    bool loads_indexed_attributes{};
 
     std::array<bool, 8> stores_frag_color{};
     bool stores_frag_depth{};
@@ -84,6 +85,7 @@ struct Info {
     bool stores_point_size{};
     bool stores_clip_distance{};
     bool stores_viewport_index{};
+    bool stores_indexed_attributes{};
 
     bool uses_fp16{};
     bool uses_fp64{};
-- 
cgit v1.2.3


From 1f3eb601acdcdfa4c119cffbf36b5792147b893f Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 6 Apr 2021 02:56:15 -0300
Subject: shader: Implement texture buffers

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 41bb5b9a1..e6f0de8d8 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -29,6 +29,7 @@ enum class TextureType : u32 {
     Shadow3D,
     ShadowCube,
     ShadowArrayCube,
+    Buffer,
 };
 
 enum class Interpolation {
@@ -50,6 +51,13 @@ struct TextureDescriptor {
 };
 using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
 
+struct TextureBufferDescriptor {
+    u32 cbuf_index;
+    u32 cbuf_offset;
+    u32 count;
+};
+using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 2>;
+
 struct ConstantBufferDescriptor {
     u32 index;
     u32 count;
@@ -112,6 +120,7 @@ struct Info {
         constant_buffer_descriptors;
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
     TextureDescriptors texture_descriptors;
+    TextureBufferDescriptors texture_buffer_descriptors;
 };
 
 } // namespace Shader
-- 
cgit v1.2.3


From e9a91bc5cc2c39b476ba8946f66930f5ab5608b2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 6 Apr 2021 20:14:55 -0300
Subject: shader: Interact texture buffers with buffer cache

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index e6f0de8d8..4cc731198 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -119,8 +119,8 @@ struct Info {
     boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
         constant_buffer_descriptors;
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
-    TextureDescriptors texture_descriptors;
     TextureBufferDescriptors texture_buffer_descriptors;
+    TextureDescriptors texture_descriptors;
 };
 
 } // namespace Shader
-- 
cgit v1.2.3


From 7cb2ab358517d95ebcd35c94c72b9e91762906c3 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 9 Apr 2021 01:45:39 -0300
Subject: shader: Implement SULD and SUST

---
 src/shader_recompiler/shader_info.h | 47 +++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 15 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 4cc731198..253b6eacf 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -22,15 +22,20 @@ enum class TextureType : u32 {
     Color3D,
     ColorCube,
     ColorArrayCube,
-    Shadow1D,
-    ShadowArray1D,
-    Shadow2D,
-    ShadowArray2D,
-    Shadow3D,
-    ShadowCube,
-    ShadowArrayCube,
     Buffer,
 };
+constexpr u32 NUM_TEXTURE_TYPES = 8;
+
+enum class ImageFormat : u32 {
+    Typeless,
+    R8_UINT,
+    R8_SINT,
+    R16_UINT,
+    R16_SINT,
+    R32_UINT,
+    R32G32_UINT,
+    R32G32B32A32_UINT,
+};
 
 enum class Interpolation {
     Smooth,
@@ -43,32 +48,43 @@ struct InputVarying {
     bool used{false};
 };
 
-struct TextureDescriptor {
-    TextureType type;
+struct ConstantBufferDescriptor {
+    u32 index;
+    u32 count;
+};
+
+struct StorageBufferDescriptor {
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
+    bool is_written;
 };
-using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
 
 struct TextureBufferDescriptor {
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
 };
-using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 2>;
+using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 6>;
 
-struct ConstantBufferDescriptor {
-    u32 index;
+struct TextureDescriptor {
+    TextureType type;
+    bool is_depth;
+    u32 cbuf_index;
+    u32 cbuf_offset;
     u32 count;
 };
+using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
 
-struct StorageBufferDescriptor {
+struct ImageDescriptor {
+    TextureType type;
+    ImageFormat format;
+    bool is_written;
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
-    bool is_written;
 };
+using ImageDescriptors = boost::container::small_vector<ImageDescriptor, 4>;
 
 struct Info {
     static constexpr size_t MAX_CBUFS{18};
@@ -121,6 +137,7 @@ struct Info {
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
     TextureBufferDescriptors texture_buffer_descriptors;
     TextureDescriptors texture_descriptors;
+    ImageDescriptors image_descriptors;
 };
 
 } // namespace Shader
-- 
cgit v1.2.3


From ab543f18213133b3076b81f30df386d5cb470e49 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 11 Apr 2021 02:37:03 -0300
Subject: spirv: Guard against typeless image reads on unsupported devices

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 253b6eacf..3fbe99268 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -127,6 +127,7 @@ struct Info {
     bool uses_subgroup_vote{};
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
+    bool uses_typeless_image_reads{};
 
     IR::Type used_constant_buffer_types{};
 
-- 
cgit v1.2.3


From 3db2b3effa953ae66457b7a19b419fc4db2c4801 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 11 Apr 2021 02:07:02 -0400
Subject: shader: Implement ATOM/S and RED

---
 src/shader_recompiler/shader_info.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 3fbe99268..7bcecf554 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -128,6 +128,19 @@ struct Info {
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
     bool uses_typeless_image_reads{};
+    bool uses_shared_increment{};
+    bool uses_shared_decrement{};
+    bool uses_global_increment{};
+    bool uses_global_decrement{};
+    bool uses_atomic_f32_add{};
+    bool uses_atomic_f16x2_add{};
+    bool uses_atomic_f16x2_min{};
+    bool uses_atomic_f16x2_max{};
+    bool uses_atomic_f32x2_add{};
+    bool uses_atomic_f32x2_min{};
+    bool uses_atomic_f32x2_max{};
+    bool uses_64_bit_atomics{};
+    bool uses_shared_memory_u32x2{};
 
     IR::Type used_constant_buffer_types{};
 
-- 
cgit v1.2.3


From 5c61e860e4f83524ffce10ca447398e83de81640 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 11 Apr 2021 19:16:12 -0300
Subject: shader: Implement SR_THREAD_KILL

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 7bcecf554..aa204ae37 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -92,6 +92,7 @@ struct Info {
 
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
+    bool uses_is_helper_invocation{};
     bool uses_subgroup_invocation_id{};
 
     std::array<InputVarying, 32> input_generics{};
-- 
cgit v1.2.3


From 23b87147321d02abf47868f231f00f29b0d3b87d Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 11 Apr 2021 21:02:44 -0300
Subject: spirv: Define StorageImageWriteWithoutFormat capability when used

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index aa204ae37..6a51aabb5 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -129,6 +129,7 @@ struct Info {
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
     bool uses_typeless_image_reads{};
+    bool uses_typeless_image_writes{};
     bool uses_shared_increment{};
     bool uses_shared_decrement{};
     bool uses_global_increment{};
-- 
cgit v1.2.3


From fa75b9b0626c8e118e27207dd1e82e2f415fc0bc Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 13 Apr 2021 05:32:21 -0300
Subject: spirv: Rework storage buffers and shader memory

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 6a51aabb5..15cf09c3d 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -141,10 +141,10 @@ struct Info {
     bool uses_atomic_f32x2_add{};
     bool uses_atomic_f32x2_min{};
     bool uses_atomic_f32x2_max{};
-    bool uses_64_bit_atomics{};
-    bool uses_shared_memory_u32x2{};
+    bool uses_int64_bit_atomics{};
 
     IR::Type used_constant_buffer_types{};
+    IR::Type used_storage_buffer_types{};
 
     u32 constant_buffer_mask{};
 
-- 
cgit v1.2.3


From d8ec99dadaa033aa440671572ed38e2614815e11 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 14 Apr 2021 18:09:18 -0300
Subject: spirv: Implement Layer stores

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 15cf09c3d..e078b0fa1 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -109,6 +109,7 @@ struct Info {
     bool stores_position{};
     bool stores_point_size{};
     bool stores_clip_distance{};
+    bool stores_layer{};
     bool stores_viewport_index{};
     bool stores_indexed_attributes{};
 
-- 
cgit v1.2.3


From 416e1b7441d34512fcb0ffed014daf7ca4bb62bd Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 14 Apr 2021 21:36:36 -0300
Subject: spirv: Implement image buffers

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index e078b0fa1..336c6131a 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -67,6 +67,15 @@ struct TextureBufferDescriptor {
 };
 using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 6>;
 
+struct ImageBufferDescriptor {
+    ImageFormat format;
+    bool is_written;
+    u32 cbuf_index;
+    u32 cbuf_offset;
+    u32 count;
+};
+using ImageBufferDescriptors = boost::container::small_vector<ImageBufferDescriptor, 2>;
+
 struct TextureDescriptor {
     TextureType type;
     bool is_depth;
@@ -153,6 +162,7 @@ struct Info {
         constant_buffer_descriptors;
     boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors;
     TextureBufferDescriptors texture_buffer_descriptors;
+    ImageBufferDescriptors image_buffer_descriptors;
     TextureDescriptors texture_descriptors;
     ImageDescriptors image_descriptors;
 };
-- 
cgit v1.2.3


From 183855e396cc6918d36fbf3e38ea426e934b4e3e Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 15 Apr 2021 22:46:11 -0300
Subject: shader: Implement tessellation shaders, polygon mode and invocation
 id

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 336c6131a..4dbf9ed12 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -101,8 +101,10 @@ struct Info {
 
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
+    bool uses_invocation_id{};
     bool uses_is_helper_invocation{};
     bool uses_subgroup_invocation_id{};
+    std::array<bool, 30> uses_patches{};
 
     std::array<InputVarying, 32> input_generics{};
     bool loads_position{};
@@ -110,6 +112,7 @@ struct Info {
     bool loads_vertex_id{};
     bool loads_front_face{};
     bool loads_point_coord{};
+    bool loads_tess_coord{};
     bool loads_indexed_attributes{};
 
     std::array<bool, 8> stores_frag_color{};
@@ -120,6 +123,8 @@ struct Info {
     bool stores_clip_distance{};
     bool stores_layer{};
     bool stores_viewport_index{};
+    bool stores_tess_level_outer{};
+    bool stores_tess_level_inner{};
     bool stores_indexed_attributes{};
 
     bool uses_fp16{};
-- 
cgit v1.2.3


From b0f1255c8cb800e9f336be66b3f16c3d958673d2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 16 Apr 2021 01:55:06 -0300
Subject: shader: Implement PrimitiveId

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 4dbf9ed12..d6cde1596 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -107,6 +107,7 @@ struct Info {
     std::array<bool, 30> uses_patches{};
 
     std::array<InputVarying, 32> input_generics{};
+    bool loads_primitive_id{};
     bool loads_position{};
     bool loads_instance_id{};
     bool loads_vertex_id{};
-- 
cgit v1.2.3


From e3514bcd6b09f623da14c4f3c4ffd988e75577ed Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 16 Apr 2021 16:31:15 -0300
Subject: spirv: Implement ViewportMask with NV_viewport_array2

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d6cde1596..d33df8aad 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -124,6 +124,7 @@ struct Info {
     bool stores_clip_distance{};
     bool stores_layer{};
     bool stores_viewport_index{};
+    bool stores_viewport_mask{};
     bool stores_tess_level_outer{};
     bool stores_tess_level_inner{};
     bool stores_indexed_attributes{};
-- 
cgit v1.2.3


From 95815a3883d708f71db5119f42243e183f32f9a2 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 16 Apr 2021 17:22:59 -0300
Subject: shader: Implement PIXLD.MY_INDEX

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d33df8aad..686f5c719 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -102,6 +102,7 @@ struct Info {
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
     bool uses_invocation_id{};
+    bool uses_sample_id{};
     bool uses_is_helper_invocation{};
     bool uses_subgroup_invocation_id{};
     std::array<bool, 30> uses_patches{};
-- 
cgit v1.2.3


From 80940b17069f6baa733a9b572445b27bc7509137 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Fri, 16 Apr 2021 18:47:26 -0300
Subject: shader: Implement SampleMask

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 686f5c719..0a8931930 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -118,6 +118,7 @@ struct Info {
     bool loads_indexed_attributes{};
 
     std::array<bool, 8> stores_frag_color{};
+    bool stores_sample_mask{};
     bool stores_frag_depth{};
     std::array<bool, 32> stores_generics{};
     bool stores_position{};
-- 
cgit v1.2.3


From 04c459fc8d99b41fa8a03c49523599e9bf797f9d Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sat, 17 Apr 2021 11:56:45 +0200
Subject: shader: Implement fine derivates constant propagation

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 0a8931930..3f22958e8 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -147,6 +147,7 @@ struct Info {
     bool uses_subgroup_vote{};
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
+    bool uses_derivates{};
     bool uses_typeless_image_reads{};
     bool uses_typeless_image_writes{};
     bool uses_shared_increment{};
-- 
cgit v1.2.3


From f69d0b91ffad7d9ab827f55a9297b8f6da815cc9 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sun, 18 Apr 2021 09:07:48 +0200
Subject: shader: Address feedback

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 3f22958e8..f808adeba 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -147,7 +147,7 @@ struct Info {
     bool uses_subgroup_vote{};
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
-    bool uses_derivates{};
+    bool uses_derivatives{};
     bool uses_typeless_image_reads{};
     bool uses_typeless_image_writes{};
     bool uses_shared_increment{};
-- 
cgit v1.2.3


From 7018e524f5e6217b3259333acc4ea09ad036d331 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 19 Apr 2021 16:33:23 -0300
Subject: shader: Add NVN storage buffer fallbacks

When we can't track the SSBO origin of a global memory instruction,
leave it as a global memory operation and assume these pointers are in
the NVN storage buffer slots, then apply a linear search in the shader's
runtime.
---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index f808adeba..50b4d1c05 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -162,6 +162,7 @@ struct Info {
     bool uses_atomic_f32x2_min{};
     bool uses_atomic_f32x2_max{};
     bool uses_int64_bit_atomics{};
+    bool uses_global_memory{};
 
     IR::Type used_constant_buffer_types{};
     IR::Type used_storage_buffer_types{};
-- 
cgit v1.2.3


From dd860b684c7695097107c1186e96a70e754e5990 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 20 Apr 2021 19:48:45 -0300
Subject: shader: Implement D3D samplers

---
 src/shader_recompiler/shader_info.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 50b4d1c05..0f45bdfb6 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -61,8 +61,11 @@ struct StorageBufferDescriptor {
 };
 
 struct TextureBufferDescriptor {
+    bool has_secondary;
     u32 cbuf_index;
     u32 cbuf_offset;
+    u32 secondary_cbuf_index;
+    u32 secondary_cbuf_offset;
     u32 count;
 };
 using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 6>;
@@ -79,8 +82,11 @@ using ImageBufferDescriptors = boost::container::small_vector<ImageBufferDescrip
 struct TextureDescriptor {
     TextureType type;
     bool is_depth;
+    bool has_secondary;
     u32 cbuf_index;
     u32 cbuf_offset;
+    u32 secondary_cbuf_index;
+    u32 secondary_cbuf_offset;
     u32 count;
 };
 using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
-- 
cgit v1.2.3


From d10cf55353175b13bed4cf18791e080ecb7fd95b Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 22 Apr 2021 16:17:59 -0300
Subject: shader: Implement indexed textures

---
 src/shader_recompiler/shader_info.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 0f45bdfb6..0f28ae07b 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -67,6 +67,7 @@ struct TextureBufferDescriptor {
     u32 secondary_cbuf_index;
     u32 secondary_cbuf_offset;
     u32 count;
+    u32 size_shift;
 };
 using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDescriptor, 6>;
 
@@ -76,6 +77,7 @@ struct ImageBufferDescriptor {
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
+    u32 size_shift;
 };
 using ImageBufferDescriptors = boost::container::small_vector<ImageBufferDescriptor, 2>;
 
@@ -88,6 +90,7 @@ struct TextureDescriptor {
     u32 secondary_cbuf_index;
     u32 secondary_cbuf_offset;
     u32 count;
+    u32 size_shift;
 };
 using TextureDescriptors = boost::container::small_vector<TextureDescriptor, 12>;
 
@@ -98,6 +101,7 @@ struct ImageDescriptor {
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
+    u32 size_shift;
 };
 using ImageDescriptors = boost::container::small_vector<ImageDescriptor, 4>;
 
-- 
cgit v1.2.3


From 155be4a8d3992abc25ee0a887212e33c2cc17155 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 22 Apr 2021 20:32:38 -0300
Subject: shader: Increase the maximum number of storage buffers

Compute shaders spill uniform buffers on storage buffers, increasing the
expected number.
---
 src/shader_recompiler/shader_info.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 0f28ae07b..cb1969b3a 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -107,7 +107,7 @@ using ImageDescriptors = boost::container::small_vector<ImageDescriptor, 4>;
 
 struct Info {
     static constexpr size_t MAX_CBUFS{18};
-    static constexpr size_t MAX_SSBOS{16};
+    static constexpr size_t MAX_SSBOS{32};
 
     bool uses_workgroup_id{};
     bool uses_local_invocation_id{};
-- 
cgit v1.2.3


From 7ecc6de56ae01602b25408db8b6658d7a41a419a Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 23 Apr 2021 17:47:54 -0400
Subject: shader: Implement Int32 SUATOM/SURED

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

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index cb1969b3a..2f6adf714 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -160,6 +160,7 @@ struct Info {
     bool uses_derivatives{};
     bool uses_typeless_image_reads{};
     bool uses_typeless_image_writes{};
+    bool uses_image_buffers{};
     bool uses_shared_increment{};
     bool uses_shared_decrement{};
     bool uses_global_increment{};
@@ -173,6 +174,7 @@ struct Info {
     bool uses_atomic_f32x2_max{};
     bool uses_int64_bit_atomics{};
     bool uses_global_memory{};
+    bool uses_atomic_image_u32{};
 
     IR::Type used_constant_buffer_types{};
     IR::Type used_storage_buffer_types{};
-- 
cgit v1.2.3


From ee61ec2c39e6db53c56e7ac761a2223d99f06908 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sun, 2 May 2021 01:50:27 +0200
Subject: shader: Optimize NVN Fallthrough

---
 src/shader_recompiler/shader_info.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 2f6adf714..a50a9a18c 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <bitset>
 
 #include "common/common_types.h"
 #include "shader_recompiler/frontend/ir/type.h"
@@ -140,6 +141,7 @@ struct Info {
     bool stores_tess_level_outer{};
     bool stores_tess_level_inner{};
     bool stores_indexed_attributes{};
+    bool stores_global_memory{};
 
     bool uses_fp16{};
     bool uses_fp64{};
@@ -180,6 +182,8 @@ struct Info {
     IR::Type used_storage_buffer_types{};
 
     u32 constant_buffer_mask{};
+    u32 nvn_buffer_base{};
+    std::bitset<16> nvn_buffer_used{};
 
     boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS>
         constant_buffer_descriptors;
-- 
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/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index a50a9a18c..d6c32fbe5 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -116,6 +116,7 @@ struct Info {
     bool uses_sample_id{};
     bool uses_is_helper_invocation{};
     bool uses_subgroup_invocation_id{};
+    bool uses_subgroup_shuffles{};
     std::array<bool, 30> uses_patches{};
 
     std::array<InputVarying, 32> input_generics{};
-- 
cgit v1.2.3


From ac0f5d2ab6cf0843c9ac6179b52b1e069a78069e Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 31 May 2021 04:19:31 -0300
Subject: shader: Track legacy varyings

---
 src/shader_recompiler/shader_info.h | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d6c32fbe5..b60ba0457 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -122,26 +122,39 @@ struct Info {
     std::array<InputVarying, 32> input_generics{};
     bool loads_primitive_id{};
     bool loads_position{};
+    bool loads_color_front_diffuse{};
+    bool loads_point_coord{};
     bool loads_instance_id{};
     bool loads_vertex_id{};
     bool loads_front_face{};
-    bool loads_point_coord{};
+
     bool loads_tess_coord{};
+
     bool loads_indexed_attributes{};
 
     std::array<bool, 8> stores_frag_color{};
     bool stores_sample_mask{};
     bool stores_frag_depth{};
+
     std::array<bool, 32> stores_generics{};
-    bool stores_position{};
-    bool stores_point_size{};
-    bool stores_clip_distance{};
     bool stores_layer{};
     bool stores_viewport_index{};
+    bool stores_point_size{};
+    bool stores_position{};
+    bool stores_color_front_diffuse{};
+    bool stores_color_front_specular{};
+    bool stores_color_back_diffuse{};
+    bool stores_color_back_specular{};
+    bool stores_fixed_fnc_textures{};
+    bool stores_clip_distance{};
+    bool stores_fog_coordinate{};
     bool stores_viewport_mask{};
+
     bool stores_tess_level_outer{};
     bool stores_tess_level_inner{};
+
     bool stores_indexed_attributes{};
+
     bool stores_global_memory{};
 
     bool uses_fp16{};
-- 
cgit v1.2.3


From 5539b13c5a696de553be86bb7c4ae61a0cdcc754 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 31 May 2021 05:34:53 -0300
Subject: shader,glasm: Implement legacy texcoord loads

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index b60ba0457..d5b2ca7bc 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -123,6 +123,7 @@ struct Info {
     bool loads_primitive_id{};
     bool loads_position{};
     bool loads_color_front_diffuse{};
+    bool loads_fixed_fnc_textures{};
     bool loads_point_coord{};
     bool loads_instance_id{};
     bool loads_vertex_id{};
-- 
cgit v1.2.3


From 4a2361a1e2271727f3259e8e4a60869165537253 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 2 Jun 2021 02:15:07 -0300
Subject: buffer_cache: Reduce uniform buffer size from shader usage

Increases performance significantly on certain titles.
---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index d5b2ca7bc..32f8a50ea 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -197,6 +197,7 @@ struct Info {
     IR::Type used_storage_buffer_types{};
 
     u32 constant_buffer_mask{};
+    std::array<u32, MAX_CBUFS> constant_buffer_used_sizes{};
     u32 nvn_buffer_base{};
     std::bitset<16> nvn_buffer_used{};
 
-- 
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/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 32f8a50ea..be05eafcf 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -190,6 +190,7 @@ struct Info {
     bool uses_atomic_f32x2_min{};
     bool uses_atomic_f32x2_max{};
     bool uses_int64_bit_atomics{};
+    bool uses_s32_atomics{};
     bool uses_global_memory{};
     bool uses_atomic_image_u32{};
 
-- 
cgit v1.2.3


From 5399906c26292634ab3eec5fce88640092e9c4c2 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 25 May 2021 22:13:50 -0400
Subject: glsl: Track S32 atomics

---
 src/shader_recompiler/shader_info.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index be05eafcf..9f7f0b42c 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -189,8 +189,9 @@ struct Info {
     bool uses_atomic_f32x2_add{};
     bool uses_atomic_f32x2_min{};
     bool uses_atomic_f32x2_max{};
+    bool uses_atomic_s32_min{};
+    bool uses_atomic_s32_max{};
     bool uses_int64_bit_atomics{};
-    bool uses_s32_atomics{};
     bool uses_global_memory{};
     bool uses_atomic_image_u32{};
 
-- 
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/shader_info.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 9f7f0b42c..7536c9caf 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -128,6 +128,7 @@ struct Info {
     bool loads_instance_id{};
     bool loads_vertex_id{};
     bool loads_front_face{};
+    bool loads_legacy_varyings{};
 
     bool loads_tess_coord{};
 
@@ -150,6 +151,7 @@ struct Info {
     bool stores_clip_distance{};
     bool stores_fog_coordinate{};
     bool stores_viewport_mask{};
+    bool stores_legacy_varyings{};
 
     bool stores_tess_level_outer{};
     bool stores_tess_level_inner{};
-- 
cgit v1.2.3


From a0d0704affa0f86ba29ef59d90fa06c1b7c974da Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 13 Jun 2021 19:12:03 -0400
Subject: glsl: Conditionally add EXT_texture_shadow_lod

---
 src/shader_recompiler/shader_info.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 7536c9caf..74d7a6a94 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -196,6 +196,7 @@ struct Info {
     bool uses_int64_bit_atomics{};
     bool uses_global_memory{};
     bool uses_atomic_image_u32{};
+    bool uses_shadow_lod{};
 
     IR::Type used_constant_buffer_types{};
     IR::Type used_storage_buffer_types{};
-- 
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/shader_info.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 74d7a6a94..e9ebc16a4 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -75,6 +75,7 @@ using TextureBufferDescriptors = boost::container::small_vector<TextureBufferDes
 struct ImageBufferDescriptor {
     ImageFormat format;
     bool is_written;
+    bool is_read;
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
@@ -99,6 +100,7 @@ struct ImageDescriptor {
     TextureType type;
     ImageFormat format;
     bool is_written;
+    bool is_read;
     u32 cbuf_index;
     u32 cbuf_offset;
     u32 count;
-- 
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/shader_info.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index e9ebc16a4..a20e15d2e 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -140,7 +140,7 @@ struct Info {
     bool stores_sample_mask{};
     bool stores_frag_depth{};
 
-    std::array<bool, 32> stores_generics{};
+    std::bitset<32> stores_generics{};
     bool stores_layer{};
     bool stores_viewport_index{};
     bool stores_point_size{};
-- 
cgit v1.2.3


From 7dafa96ab59892b7f1fbffdb61e4326e6443955f Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Thu, 24 Jun 2021 02:41:09 -0300
Subject: shader: Rework varyings and implement passthrough geometry shaders

Put all varyings into a single std::bitset with helpers to access it.

Implement passthrough geometry shaders using host's.
---
 src/shader_recompiler/shader_info.h | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

(limited to 'src/shader_recompiler/shader_info.h')

diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index a20e15d2e..4ef4dbd40 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -9,6 +9,7 @@
 
 #include "common/common_types.h"
 #include "shader_recompiler/frontend/ir/type.h"
+#include "shader_recompiler/varying_state.h"
 
 #include <boost/container/small_vector.hpp>
 #include <boost/container/static_vector.hpp>
@@ -44,11 +45,6 @@ enum class Interpolation {
     NoPerspective,
 };
 
-struct InputVarying {
-    Interpolation interpolation{Interpolation::Smooth};
-    bool used{false};
-};
-
 struct ConstantBufferDescriptor {
     u32 index;
     u32 count;
@@ -121,18 +117,10 @@ struct Info {
     bool uses_subgroup_shuffles{};
     std::array<bool, 30> uses_patches{};
 
-    std::array<InputVarying, 32> input_generics{};
-    bool loads_primitive_id{};
-    bool loads_position{};
-    bool loads_color_front_diffuse{};
-    bool loads_fixed_fnc_textures{};
-    bool loads_point_coord{};
-    bool loads_instance_id{};
-    bool loads_vertex_id{};
-    bool loads_front_face{};
-    bool loads_legacy_varyings{};
-
-    bool loads_tess_coord{};
+    std::array<Interpolation, 32> interpolation{};
+    VaryingState loads;
+    VaryingState stores;
+    VaryingState passthrough;
 
     bool loads_indexed_attributes{};
 
@@ -140,21 +128,6 @@ struct Info {
     bool stores_sample_mask{};
     bool stores_frag_depth{};
 
-    std::bitset<32> stores_generics{};
-    bool stores_layer{};
-    bool stores_viewport_index{};
-    bool stores_point_size{};
-    bool stores_position{};
-    bool stores_color_front_diffuse{};
-    bool stores_color_front_specular{};
-    bool stores_color_back_diffuse{};
-    bool stores_color_back_specular{};
-    bool stores_fixed_fnc_textures{};
-    bool stores_clip_distance{};
-    bool stores_fog_coordinate{};
-    bool stores_viewport_mask{};
-    bool stores_legacy_varyings{};
-
     bool stores_tess_level_outer{};
     bool stores_tess_level_inner{};
 
-- 
cgit v1.2.3