Use vector outputs for texture operations (#3939)

* Change AggregateType to include vector type counts

* Replace VariableType uses with AggregateType and delete VariableType

* Support new local vector types on SPIR-V and GLSL

* Start using vector outputs for texture operations

* Use vectors on more texture operations

* Use vector output for ImageLoad operations

* Replace all uses of single destination texture constructors with multi destination ones

* Update textureGatherOffsets replacement to split vector operations

* Shader cache version bump

Co-authored-by: Ac_K <Acoustik666@gmail.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs
index 2ec44277..eb27e9bf 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Graphics.Shader.StructuredIr;
+using Ryujinx.Graphics.Shader.Translation;
 using System;
 using System.Globalization;
 
@@ -8,21 +8,21 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
     {
         private const int MaxDecimal = 256;
 
-        public static bool TryFormat(int value, VariableType dstType, out string formatted)
+        public static bool TryFormat(int value, AggregateType dstType, out string formatted)
         {
-            if (dstType == VariableType.F32)
+            if (dstType == AggregateType.FP32)
             {
                 return TryFormatFloat(BitConverter.Int32BitsToSingle(value), out formatted);
             }
-            else if (dstType == VariableType.S32)
+            else if (dstType == AggregateType.S32)
             {
                 formatted = FormatInt(value);
             }
-            else if (dstType == VariableType.U32)
+            else if (dstType == AggregateType.U32)
             {
                 formatted = FormatUint((uint)value);
             }
-            else if (dstType == VariableType.Bool)
+            else if (dstType == AggregateType.Bool)
             {
                 formatted = value != 0 ? "true" : "false";
             }
@@ -65,13 +65,13 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
             return true;
         }
 
-        public static string FormatInt(int value, VariableType dstType)
+        public static string FormatInt(int value, AggregateType dstType)
         {
-            if (dstType == VariableType.S32)
+            if (dstType == AggregateType.S32)
             {
                 return FormatInt(value);
             }
-            else if (dstType == VariableType.U32)
+            else if (dstType == AggregateType.U32)
             {
                 return FormatUint((uint)value);
             }