Move solution and projects to src

11 files changed, 0 insertions, 1777 deletions

diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs
deleted file mode 100644
index 01bd11e5..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.StructuredIr;
-using Ryujinx.Graphics.Shader.Translation;
-using System;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenBallot;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenCall;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenFSI;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenMemory;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenPacking;
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenVector;
-using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGen
-    {
-        public static string GetExpression(CodeGenContext context, IAstNode node)
-        {
-            if (node is AstOperation operation)
-            {
-                return GetExpression(context, operation);
-            }
-            else if (node is AstOperand operand)
-            {
-                return context.OperandManager.GetExpression(context, operand);
-            }
-
-            throw new ArgumentException($"Invalid node type \"{node?.GetType().Name ?? "null"}\".");
-        }
-
-        public static string Negate(CodeGenContext context, AstOperation operation, InstInfo info)
-        {
-            IAstNode src = operation.GetSource(0);
-
-            AggregateType type = GetSrcVarType(operation.Inst, 0);
-
-            string srcExpr = GetSoureExpr(context, src, type);
-            string zero;
-
-            if (type == AggregateType.FP64)
-            {
-                zero = "0.0";
-            }
-            else
-            {
-                NumberFormatter.TryFormat(0, type, out zero);
-            }
-
-            // Starting in the 496.13 NVIDIA driver, there's an issue with assigning variables to negated expressions.
-            // (-expr) does not work, but (0.0 - expr) does. This should be removed once the issue is resolved.
-
-            return $"{zero} - {Enclose(srcExpr, src, operation.Inst, info, false)}";
-        }
-
-        private static string GetExpression(CodeGenContext context, AstOperation operation)
-        {
-            Instruction inst = operation.Inst;
-
-            InstInfo info = GetInstructionInfo(inst);
-
-            if ((info.Type & InstType.Call) != 0)
-            {
-                bool atomic = (info.Type & InstType.Atomic) != 0;
-
-                int arity = (int)(info.Type & InstType.ArityMask);
-
-                string args = string.Empty;
-
-                for (int argIndex = 0; argIndex < arity; argIndex++)
-                {
-                    // For shared memory access, the second argument is unused and should be ignored.
-                    // It is there to make both storage and shared access have the same number of arguments.
-                    // For storage, both inputs are consumed when the argument index is 0, so we should skip it here.
-                    if (argIndex == 1 && (atomic || operation.StorageKind == StorageKind.SharedMemory))
-                    {
-                        continue;
-                    }
-
-                    if (argIndex != 0)
-                    {
-                        args += ", ";
-                    }
-
-                    if (argIndex == 0 && atomic)
-                    {
-                        switch (operation.StorageKind)
-                        {
-                            case StorageKind.SharedMemory: args += LoadShared(context, operation); break;
-                            case StorageKind.StorageBuffer: args += LoadStorage(context, operation); break;
-
-                            default: throw new InvalidOperationException($"Invalid storage kind \"{operation.StorageKind}\".");
-                        }
-                    }
-                    else
-                    {
-                        AggregateType dstType = GetSrcVarType(inst, argIndex);
-
-                        args += GetSoureExpr(context, operation.GetSource(argIndex), dstType);
-                    }
-                }
-
-                return info.OpName + '(' + args + ')';
-            }
-            else if ((info.Type & InstType.Op) != 0)
-            {
-                string op = info.OpName;
-
-                // Return may optionally have a return value (and in this case it is unary).
-                if (inst == Instruction.Return && operation.SourcesCount != 0)
-                {
-                    return $"{op} {GetSoureExpr(context, operation.GetSource(0), context.CurrentFunction.ReturnType)}";
-                }
-
-                int arity = (int)(info.Type & InstType.ArityMask);
-
-                string[] expr = new string[arity];
-
-                for (int index = 0; index < arity; index++)
-                {
-                    IAstNode src = operation.GetSource(index);
-
-                    string srcExpr = GetSoureExpr(context, src, GetSrcVarType(inst, index));
-
-                    bool isLhs = arity == 2 && index == 0;
-
-                    expr[index] = Enclose(srcExpr, src, inst, info, isLhs);
-                }
-
-                switch (arity)
-                {
-                    case 0:
-                        return op;
-
-                    case 1:
-                        return op + expr[0];
-
-                    case 2:
-                        return $"{expr[0]} {op} {expr[1]}";
-
-                    case 3:
-                        return $"{expr[0]} {op[0]} {expr[1]} {op[1]} {expr[2]}";
-                }
-            }
-            else if ((info.Type & InstType.Special) != 0)
-            {
-                switch (inst & Instruction.Mask)
-                {
-                    case Instruction.Ballot:
-                        return Ballot(context, operation);
-
-                    case Instruction.Call:
-                        return Call(context, operation);
-
-                    case Instruction.FSIBegin:
-                        return FSIBegin(context);
-
-                    case Instruction.FSIEnd:
-                        return FSIEnd(context);
-
-                    case Instruction.ImageLoad:
-                    case Instruction.ImageStore:
-                    case Instruction.ImageAtomic:
-                        return ImageLoadOrStore(context, operation);
-
-                    case Instruction.Load:
-                        return Load(context, operation);
-
-                    case Instruction.LoadConstant:
-                        return LoadConstant(context, operation);
-
-                    case Instruction.LoadLocal:
-                        return LoadLocal(context, operation);
-
-                    case Instruction.LoadShared:
-                        return LoadShared(context, operation);
-
-                    case Instruction.LoadStorage:
-                        return LoadStorage(context, operation);
-
-                    case Instruction.Lod:
-                        return Lod(context, operation);
-
-                    case Instruction.Negate:
-                        return Negate(context, operation, info);
-
-                    case Instruction.PackDouble2x32:
-                        return PackDouble2x32(context, operation);
-
-                    case Instruction.PackHalf2x16:
-                        return PackHalf2x16(context, operation);
-
-                    case Instruction.Store:
-                        return Store(context, operation);
-
-                    case Instruction.StoreLocal:
-                        return StoreLocal(context, operation);
-
-                    case Instruction.StoreShared:
-                        return StoreShared(context, operation);
-
-                    case Instruction.StoreShared16:
-                        return StoreShared16(context, operation);
-
-                    case Instruction.StoreShared8:
-                        return StoreShared8(context, operation);
-
-                    case Instruction.StoreStorage:
-                        return StoreStorage(context, operation);
-
-                    case Instruction.StoreStorage16:
-                        return StoreStorage16(context, operation);
-
-                    case Instruction.StoreStorage8:
-                        return StoreStorage8(context, operation);
-
-                    case Instruction.TextureSample:
-                        return TextureSample(context, operation);
-
-                    case Instruction.TextureSize:
-                        return TextureSize(context, operation);
-
-                    case Instruction.UnpackDouble2x32:
-                        return UnpackDouble2x32(context, operation);
-
-                    case Instruction.UnpackHalf2x16:
-                        return UnpackHalf2x16(context, operation);
-
-                    case Instruction.VectorExtract:
-                        return VectorExtract(context, operation);
-                }
-            }
-
-            throw new InvalidOperationException($"Unexpected instruction type \"{info.Type}\".");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs
deleted file mode 100644
index 68793c5d..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Ryujinx.Graphics.Shader.StructuredIr;
-using Ryujinx.Graphics.Shader.Translation;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenBallot
-    {
-        public static string Ballot(CodeGenContext context, AstOperation operation)
-        {
-            AggregateType dstType = GetSrcVarType(operation.Inst, 0);
-
-            string arg = GetSoureExpr(context, operation.GetSource(0), dstType);
-
-            if (context.Config.GpuAccessor.QueryHostSupportsShaderBallot())
-            {
-                return $"unpackUint2x32(ballotARB({arg})).x";
-            }
-            else
-            {
-                return $"subgroupBallot({arg}).x";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs
deleted file mode 100644
index 2df6960d..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.StructuredIr;
-using System.Diagnostics;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenCall
-    {
-        public static string Call(CodeGenContext context, AstOperation operation)
-        {
-            AstOperand funcId = (AstOperand)operation.GetSource(0);
-
-            Debug.Assert(funcId.Type == OperandType.Constant);
-
-            var function = context.GetFunction(funcId.Value);
-
-            string[] args = new string[operation.SourcesCount - 1];
-
-            for (int i = 0; i < args.Length; i++)
-            {
-                args[i] = GetSoureExpr(context, operation.GetSource(i + 1), function.GetArgumentType(i));
-            }
-
-            return $"{function.Name}({string.Join(", ", args)})";
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs
deleted file mode 100644
index f61a53cb..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenFSI
-    {
-        public static string FSIBegin(CodeGenContext context)
-        {
-            if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderInterlock())
-            {
-                return "beginInvocationInterlockARB()";
-            }
-            else if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderOrderingIntel())
-            {
-                return "beginFragmentShaderOrderingINTEL()";
-            }
-
-            return null;
-        }
-
-        public static string FSIEnd(CodeGenContext context)
-        {
-            if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderInterlock())
-            {
-                return "endInvocationInterlockARB()";
-            }
-
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs
deleted file mode 100644
index 00478f6a..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.StructuredIr;
-using Ryujinx.Graphics.Shader.Translation;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.TypeConversion;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenHelper
-    {
-        private static readonly InstInfo[] _infoTable;
-
-        static InstGenHelper()
-        {
-            _infoTable = new InstInfo[(int)Instruction.Count];
-
-            Add(Instruction.AtomicAdd,                InstType.AtomicBinary,   "atomicAdd");
-            Add(Instruction.AtomicAnd,                InstType.AtomicBinary,   "atomicAnd");
-            Add(Instruction.AtomicCompareAndSwap,     InstType.AtomicTernary,  "atomicCompSwap");
-            Add(Instruction.AtomicMaxS32,             InstType.CallTernary,    HelperFunctionNames.AtomicMaxS32);
-            Add(Instruction.AtomicMaxU32,             InstType.AtomicBinary,   "atomicMax");
-            Add(Instruction.AtomicMinS32,             InstType.CallTernary,    HelperFunctionNames.AtomicMinS32);
-            Add(Instruction.AtomicMinU32,             InstType.AtomicBinary,   "atomicMin");
-            Add(Instruction.AtomicOr,                 InstType.AtomicBinary,   "atomicOr");
-            Add(Instruction.AtomicSwap,               InstType.AtomicBinary,   "atomicExchange");
-            Add(Instruction.AtomicXor,                InstType.AtomicBinary,   "atomicXor");
-            Add(Instruction.Absolute,                 InstType.CallUnary,      "abs");
-            Add(Instruction.Add,                      InstType.OpBinaryCom,    "+",               2);
-            Add(Instruction.Ballot,                   InstType.Special);
-            Add(Instruction.Barrier,                  InstType.CallNullary,    "barrier");
-            Add(Instruction.BitCount,                 InstType.CallUnary,      "bitCount");
-            Add(Instruction.BitfieldExtractS32,       InstType.CallTernary,    "bitfieldExtract");
-            Add(Instruction.BitfieldExtractU32,       InstType.CallTernary,    "bitfieldExtract");
-            Add(Instruction.BitfieldInsert,           InstType.CallQuaternary, "bitfieldInsert");
-            Add(Instruction.BitfieldReverse,          InstType.CallUnary,      "bitfieldReverse");
-            Add(Instruction.BitwiseAnd,               InstType.OpBinaryCom,    "&",               6);
-            Add(Instruction.BitwiseExclusiveOr,       InstType.OpBinaryCom,    "^",               7);
-            Add(Instruction.BitwiseNot,               InstType.OpUnary,        "~",               0);
-            Add(Instruction.BitwiseOr,                InstType.OpBinaryCom,    "|",               8);
-            Add(Instruction.Call,                     InstType.Special);
-            Add(Instruction.Ceiling,                  InstType.CallUnary,      "ceil");
-            Add(Instruction.Clamp,                    InstType.CallTernary,    "clamp");
-            Add(Instruction.ClampU32,                 InstType.CallTernary,    "clamp");
-            Add(Instruction.CompareEqual,             InstType.OpBinaryCom,    "==",              5);
-            Add(Instruction.CompareGreater,           InstType.OpBinary,       ">",               4);
-            Add(Instruction.CompareGreaterOrEqual,    InstType.OpBinary,       ">=",              4);
-            Add(Instruction.CompareGreaterOrEqualU32, InstType.OpBinary,       ">=",              4);
-            Add(Instruction.CompareGreaterU32,        InstType.OpBinary,       ">",               4);
-            Add(Instruction.CompareLess,              InstType.OpBinary,       "<",               4);
-            Add(Instruction.CompareLessOrEqual,       InstType.OpBinary,       "<=",              4);
-            Add(Instruction.CompareLessOrEqualU32,    InstType.OpBinary,       "<=",              4);
-            Add(Instruction.CompareLessU32,           InstType.OpBinary,       "<",               4);
-            Add(Instruction.CompareNotEqual,          InstType.OpBinaryCom,    "!=",              5);
-            Add(Instruction.ConditionalSelect,        InstType.OpTernary,      "?:",              12);
-            Add(Instruction.ConvertFP32ToFP64,        InstType.CallUnary,      "double");
-            Add(Instruction.ConvertFP64ToFP32,        InstType.CallUnary,      "float");
-            Add(Instruction.ConvertFP32ToS32,         InstType.CallUnary,      "int");
-            Add(Instruction.ConvertFP32ToU32,         InstType.CallUnary,      "uint");
-            Add(Instruction.ConvertFP64ToS32,         InstType.CallUnary,      "int");
-            Add(Instruction.ConvertFP64ToU32,         InstType.CallUnary,      "uint");
-            Add(Instruction.ConvertS32ToFP32,         InstType.CallUnary,      "float");
-            Add(Instruction.ConvertS32ToFP64,         InstType.CallUnary,      "double");
-            Add(Instruction.ConvertU32ToFP32,         InstType.CallUnary,      "float");
-            Add(Instruction.ConvertU32ToFP64,         InstType.CallUnary,      "double");
-            Add(Instruction.Cosine,                   InstType.CallUnary,      "cos");
-            Add(Instruction.Ddx,                      InstType.CallUnary,      "dFdx");
-            Add(Instruction.Ddy,                      InstType.CallUnary,      "dFdy");
-            Add(Instruction.Discard,                  InstType.OpNullary,      "discard");
-            Add(Instruction.Divide,                   InstType.OpBinary,       "/",               1);
-            Add(Instruction.EmitVertex,               InstType.CallNullary,    "EmitVertex");
-            Add(Instruction.EndPrimitive,             InstType.CallNullary,    "EndPrimitive");
-            Add(Instruction.ExponentB2,               InstType.CallUnary,      "exp2");
-            Add(Instruction.FSIBegin,                 InstType.Special);
-            Add(Instruction.FSIEnd,                   InstType.Special);
-            Add(Instruction.FindLSB,                  InstType.CallUnary,      "findLSB");
-            Add(Instruction.FindMSBS32,               InstType.CallUnary,      "findMSB");
-            Add(Instruction.FindMSBU32,               InstType.CallUnary,      "findMSB");
-            Add(Instruction.Floor,                    InstType.CallUnary,      "floor");
-            Add(Instruction.FusedMultiplyAdd,         InstType.CallTernary,    "fma");
-            Add(Instruction.GroupMemoryBarrier,       InstType.CallNullary,    "groupMemoryBarrier");
-            Add(Instruction.ImageLoad,                InstType.Special);
-            Add(Instruction.ImageStore,               InstType.Special);
-            Add(Instruction.ImageAtomic,              InstType.Special);
-            Add(Instruction.IsNan,                    InstType.CallUnary,      "isnan");
-            Add(Instruction.Load,                     InstType.Special);
-            Add(Instruction.LoadConstant,             InstType.Special);
-            Add(Instruction.LoadLocal,                InstType.Special);
-            Add(Instruction.LoadShared,               InstType.Special);
-            Add(Instruction.LoadStorage,              InstType.Special);
-            Add(Instruction.Lod,                      InstType.Special);
-            Add(Instruction.LogarithmB2,              InstType.CallUnary,      "log2");
-            Add(Instruction.LogicalAnd,               InstType.OpBinaryCom,    "&&",              9);
-            Add(Instruction.LogicalExclusiveOr,       InstType.OpBinaryCom,    "^^",              10);
-            Add(Instruction.LogicalNot,               InstType.OpUnary,        "!",               0);
-            Add(Instruction.LogicalOr,                InstType.OpBinaryCom,    "||",              11);
-            Add(Instruction.LoopBreak,                InstType.OpNullary,      "break");
-            Add(Instruction.LoopContinue,             InstType.OpNullary,      "continue");
-            Add(Instruction.PackDouble2x32,           InstType.Special);
-            Add(Instruction.PackHalf2x16,             InstType.Special);
-            Add(Instruction.Maximum,                  InstType.CallBinary,     "max");
-            Add(Instruction.MaximumU32,               InstType.CallBinary,     "max");
-            Add(Instruction.MemoryBarrier,            InstType.CallNullary,    "memoryBarrier");
-            Add(Instruction.Minimum,                  InstType.CallBinary,     "min");
-            Add(Instruction.MinimumU32,               InstType.CallBinary,     "min");
-            Add(Instruction.Multiply,                 InstType.OpBinaryCom,    "*",               1);
-            Add(Instruction.MultiplyHighS32,          InstType.CallBinary,     HelperFunctionNames.MultiplyHighS32);
-            Add(Instruction.MultiplyHighU32,          InstType.CallBinary,     HelperFunctionNames.MultiplyHighU32);
-            Add(Instruction.Negate,                   InstType.Special);
-            Add(Instruction.ReciprocalSquareRoot,     InstType.CallUnary,      "inversesqrt");
-            Add(Instruction.Return,                   InstType.OpNullary,      "return");
-            Add(Instruction.Round,                    InstType.CallUnary,      "roundEven");
-            Add(Instruction.ShiftLeft,                InstType.OpBinary,       "<<",              3);
-            Add(Instruction.ShiftRightS32,            InstType.OpBinary,       ">>",              3);
-            Add(Instruction.ShiftRightU32,            InstType.OpBinary,       ">>",              3);
-            Add(Instruction.Shuffle,                  InstType.CallQuaternary, HelperFunctionNames.Shuffle);
-            Add(Instruction.ShuffleDown,              InstType.CallQuaternary, HelperFunctionNames.ShuffleDown);
-            Add(Instruction.ShuffleUp,                InstType.CallQuaternary, HelperFunctionNames.ShuffleUp);
-            Add(Instruction.ShuffleXor,               InstType.CallQuaternary, HelperFunctionNames.ShuffleXor);
-            Add(Instruction.Sine,                     InstType.CallUnary,      "sin");
-            Add(Instruction.SquareRoot,               InstType.CallUnary,      "sqrt");
-            Add(Instruction.Store,                    InstType.Special);
-            Add(Instruction.StoreLocal,               InstType.Special);
-            Add(Instruction.StoreShared,              InstType.Special);
-            Add(Instruction.StoreShared16,            InstType.Special);
-            Add(Instruction.StoreShared8,             InstType.Special);
-            Add(Instruction.StoreStorage,             InstType.Special);
-            Add(Instruction.StoreStorage16,           InstType.Special);
-            Add(Instruction.StoreStorage8,            InstType.Special);
-            Add(Instruction.Subtract,                 InstType.OpBinary,       "-",               2);
-            Add(Instruction.SwizzleAdd,               InstType.CallTernary,    HelperFunctionNames.SwizzleAdd);
-            Add(Instruction.TextureSample,            InstType.Special);
-            Add(Instruction.TextureSize,              InstType.Special);
-            Add(Instruction.Truncate,                 InstType.CallUnary,      "trunc");
-            Add(Instruction.UnpackDouble2x32,         InstType.Special);
-            Add(Instruction.UnpackHalf2x16,           InstType.Special);
-            Add(Instruction.VectorExtract,            InstType.Special);
-            Add(Instruction.VoteAll,                  InstType.CallUnary,      "allInvocationsARB");
-            Add(Instruction.VoteAllEqual,             InstType.CallUnary,      "allInvocationsEqualARB");
-            Add(Instruction.VoteAny,                  InstType.CallUnary,      "anyInvocationARB");
-        }
-
-        private static void Add(Instruction inst, InstType flags, string opName = null, int precedence = 0)
-        {
-            _infoTable[(int)inst] = new InstInfo(flags, opName, precedence);
-        }
-
-        public static InstInfo GetInstructionInfo(Instruction inst)
-        {
-            return _infoTable[(int)(inst & Instruction.Mask)];
-        }
-
-        public static string GetSoureExpr(CodeGenContext context, IAstNode node, AggregateType dstType)
-        {
-            return ReinterpretCast(context, node, OperandManager.GetNodeDestType(context, node), dstType);
-        }
-
-        public static string Enclose(string expr, IAstNode node, Instruction pInst, bool isLhs)
-        {
-            InstInfo pInfo = GetInstructionInfo(pInst);
-
-            return Enclose(expr, node, pInst, pInfo, isLhs);
-        }
-
-        public static string Enclose(string expr, IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs = false)
-        {
-            if (NeedsParenthesis(node, pInst, pInfo, isLhs))
-            {
-                expr = "(" + expr + ")";
-            }
-
-            return expr;
-        }
-
-        public static bool NeedsParenthesis(IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs)
-        {
-            // If the node isn't a operation, then it can only be a operand,
-            // and those never needs to be surrounded in parenthesis.
-            if (!(node is AstOperation operation))
-            {
-                // This is sort of a special case, if this is a negative constant,
-                // and it is consumed by a unary operation, we need to put on the parenthesis,
-                // as in GLSL a sequence like --2 or ~-1 is not valid.
-                if (IsNegativeConst(node) && pInfo.Type == InstType.OpUnary)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            if ((pInfo.Type & (InstType.Call | InstType.Special)) != 0)
-            {
-                return false;
-            }
-
-            InstInfo info = _infoTable[(int)(operation.Inst & Instruction.Mask)];
-
-            if ((info.Type & (InstType.Call | InstType.Special)) != 0)
-            {
-                return false;
-            }
-
-            if (info.Precedence < pInfo.Precedence)
-            {
-                return false;
-            }
-
-            if (info.Precedence == pInfo.Precedence && isLhs)
-            {
-                return false;
-            }
-
-            if (pInst == operation.Inst && info.Type == InstType.OpBinaryCom)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        private static bool IsNegativeConst(IAstNode node)
-        {
-            if (!(node is AstOperand operand))
-            {
-                return false;
-            }
-
-            return operand.Type == OperandType.Constant && operand.Value < 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs
deleted file mode 100644
index 99519837..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs
+++ /dev/null
@@ -1,939 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.StructuredIr;
-using Ryujinx.Graphics.Shader.Translation;
-using System;
-using System.Text;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenMemory
-    {
-        public static string ImageLoadOrStore(CodeGenContext context, AstOperation operation)
-        {
-            AstTextureOperation texOp = (AstTextureOperation)operation;
-
-            bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
-
-            // TODO: Bindless texture support. For now we just return 0/do nothing.
-            if (isBindless)
-            {
-                switch (texOp.Inst)
-                {
-                    case Instruction.ImageStore:
-                        return "// imageStore(bindless)";
-                    case Instruction.ImageLoad:
-                        AggregateType componentType = texOp.Format.GetComponentType();
-
-                        NumberFormatter.TryFormat(0, componentType, out string imageConst);
-
-                        AggregateType outputType = texOp.GetVectorType(componentType);
-
-                        if ((outputType & AggregateType.ElementCountMask) != 0)
-                        {
-                            return $"{Declarations.GetVarTypeName(context, outputType, precise: false)}({imageConst})";
-                        }
-
-                        return imageConst;
-                    default:
-                        return NumberFormatter.FormatInt(0);
-                }
-            }
-
-            bool isArray   = (texOp.Type & SamplerType.Array)   != 0;
-            bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0;
-
-            var texCallBuilder = new StringBuilder();
-
-            if (texOp.Inst == Instruction.ImageAtomic)
-            {
-                texCallBuilder.Append((texOp.Flags & TextureFlags.AtomicMask) switch {
-                    TextureFlags.Add        => "imageAtomicAdd",
-                    TextureFlags.Minimum    => "imageAtomicMin",
-                    TextureFlags.Maximum    => "imageAtomicMax",
-                    TextureFlags.Increment  => "imageAtomicAdd", // TODO: Clamp value.
-                    TextureFlags.Decrement  => "imageAtomicAdd", // TODO: Clamp value.
-                    TextureFlags.BitwiseAnd => "imageAtomicAnd",
-                    TextureFlags.BitwiseOr  => "imageAtomicOr",
-                    TextureFlags.BitwiseXor => "imageAtomicXor",
-                    TextureFlags.Swap       => "imageAtomicExchange",
-                    TextureFlags.CAS        => "imageAtomicCompSwap",
-                    _                       => "imageAtomicAdd",
-                });
-            }
-            else
-            {
-                texCallBuilder.Append(texOp.Inst == Instruction.ImageLoad ? "imageLoad" : "imageStore");
-            }
-
-            int srcIndex = isBindless ? 1 : 0;
-
-            string Src(AggregateType type)
-            {
-                return GetSoureExpr(context, texOp.GetSource(srcIndex++), type);
-            }
-
-            string indexExpr = null;
-
-            if (isIndexed)
-            {
-                indexExpr = Src(AggregateType.S32);
-            }
-
-            string imageName = OperandManager.GetImageName(context.Config.Stage, texOp, indexExpr);
-
-            texCallBuilder.Append('(');
-            texCallBuilder.Append(imageName);
-
-            int coordsCount = texOp.Type.GetDimensions();
-
-            int pCount = coordsCount + (isArray ? 1 : 0);
-
-            void Append(string str)
-            {
-                texCallBuilder.Append(", ");
-                texCallBuilder.Append(str);
-            }
-
-            string ApplyScaling(string vector)
-            {
-                if (context.Config.Stage.SupportsRenderScale() &&
-                    texOp.Inst == Instruction.ImageLoad &&
-                    !isBindless &&
-                    !isIndexed)
-                {
-                    // Image scales start after texture ones.
-                    int scaleIndex = context.Config.GetTextureDescriptors().Length + context.Config.FindImageDescriptorIndex(texOp);
-
-                    if (pCount == 3 && isArray)
-                    {
-                        // The array index is not scaled, just x and y.
-                        vector = $"ivec3(Helper_TexelFetchScale(({vector}).xy, {scaleIndex}), ({vector}).z)";
-                    }
-                    else if (pCount == 2 && !isArray)
-                    {
-                        vector = $"Helper_TexelFetchScale({vector}, {scaleIndex})";
-                    }
-                }
-
-                return vector;
-            }
-
-            if (pCount > 1)
-            {
-                string[] elems = new string[pCount];
-
-                for (int index = 0; index < pCount; index++)
-                {
-                    elems[index] = Src(AggregateType.S32);
-                }
-
-                Append(ApplyScaling($"ivec{pCount}({string.Join(", ", elems)})"));
-            }
-            else
-            {
-                Append(Src(AggregateType.S32));
-            }
-
-            if (texOp.Inst == Instruction.ImageStore)
-            {
-                AggregateType type = texOp.Format.GetComponentType();
-
-                string[] cElems = new string[4];
-
-                for (int index = 0; index < 4; index++)
-                {
-                    if (srcIndex < texOp.SourcesCount)
-                    {
-                        cElems[index] = Src(type);
-                    }
-                    else
-                    {
-                        cElems[index] = type switch
-                        {
-                            AggregateType.S32 => NumberFormatter.FormatInt(0),
-                            AggregateType.U32 => NumberFormatter.FormatUint(0),
-                            _                => NumberFormatter.FormatFloat(0)
-                        };
-                    }
-                }
-
-                string prefix = type switch
-                {
-                    AggregateType.S32 => "i",
-                    AggregateType.U32 => "u",
-                    _                => string.Empty
-                };
-
-                Append($"{prefix}vec4({string.Join(", ", cElems)})");
-            }
-
-            if (texOp.Inst == Instruction.ImageAtomic)
-            {
-                AggregateType type = texOp.Format.GetComponentType();
-
-                if ((texOp.Flags & TextureFlags.AtomicMask) == TextureFlags.CAS)
-                {
-                    Append(Src(type)); // Compare value.
-                }
-
-                string value = (texOp.Flags & TextureFlags.AtomicMask) switch
-                {
-                    TextureFlags.Increment => NumberFormatter.FormatInt(1, type), // TODO: Clamp value
-                    TextureFlags.Decrement => NumberFormatter.FormatInt(-1, type), // TODO: Clamp value
-                    _ => Src(type)
-                };
-
-                Append(value);
-
-                texCallBuilder.Append(')');
-
-                if (type != AggregateType.S32)
-                {
-                    texCallBuilder
-                        .Insert(0, "int(")
-                        .Append(')');
-                }
-            }
-            else
-            {
-                texCallBuilder.Append(')');
-
-                if (texOp.Inst == Instruction.ImageLoad)
-                {
-                    texCallBuilder.Append(GetMaskMultiDest(texOp.Index));
-                }
-            }
-
-            return texCallBuilder.ToString();
-        }
-
-        public static string Load(CodeGenContext context, AstOperation operation)
-        {
-            return GenerateLoadOrStore(context, operation, isStore: false);
-        }
-
-        public static string LoadConstant(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-
-            string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1));
-            offsetExpr = Enclose(offsetExpr, src2, Instruction.ShiftRightS32, isLhs: true);
-
-            var config = context.Config;
-            bool indexElement = !config.GpuAccessor.QueryHostHasVectorIndexingBug();
-
-            if (src1 is AstOperand operand && operand.Type == OperandType.Constant)
-            {
-                bool cbIndexable = config.UsedFeatures.HasFlag(Translation.FeatureFlags.CbIndexing);
-                return OperandManager.GetConstantBufferName(operand.Value, offsetExpr, config.Stage, cbIndexable, indexElement);
-            }
-            else
-            {
-                string slotExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-                return OperandManager.GetConstantBufferName(slotExpr, offsetExpr, config.Stage, indexElement);
-            }
-        }
-
-        public static string LoadLocal(CodeGenContext context, AstOperation operation)
-        {
-            return LoadLocalOrShared(context, operation, DefaultNames.LocalMemoryName);
-        }
-
-        public static string LoadShared(CodeGenContext context, AstOperation operation)
-        {
-            return LoadLocalOrShared(context, operation, DefaultNames.SharedMemoryName);
-        }
-
-        private static string LoadLocalOrShared(CodeGenContext context, AstOperation operation, string arrayName)
-        {
-            IAstNode src1 = operation.GetSource(0);
-
-            string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-
-            return $"{arrayName}[{offsetExpr}]";
-        }
-
-        public static string LoadStorage(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-
-            string indexExpr  = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-            string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1));
-
-            return GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage);
-        }
-
-        public static string Lod(CodeGenContext context, AstOperation operation)
-        {
-            AstTextureOperation texOp = (AstTextureOperation)operation;
-
-            int coordsCount = texOp.Type.GetDimensions();
-
-            bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
-
-            // TODO: Bindless texture support. For now we just return 0.
-            if (isBindless)
-            {
-                return NumberFormatter.FormatFloat(0);
-            }
-
-            bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0;
-
-            string indexExpr = null;
-
-            if (isIndexed)
-            {
-                indexExpr = GetSoureExpr(context, texOp.GetSource(0), AggregateType.S32);
-            }
-
-            string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr);
-
-            int coordsIndex = isBindless || isIndexed ? 1 : 0;
-
-            string coordsExpr;
-
-            if (coordsCount > 1)
-            {
-                string[] elems = new string[coordsCount];
-
-                for (int index = 0; index < coordsCount; index++)
-                {
-                    elems[index] = GetSoureExpr(context, texOp.GetSource(coordsIndex + index), AggregateType.FP32);
-                }
-
-                coordsExpr = "vec" + coordsCount + "(" + string.Join(", ", elems) + ")";
-            }
-            else
-            {
-                coordsExpr = GetSoureExpr(context, texOp.GetSource(coordsIndex), AggregateType.FP32);
-            }
-
-            return $"textureQueryLod({samplerName}, {coordsExpr}){GetMask(texOp.Index)}";
-        }
-
-        public static string Store(CodeGenContext context, AstOperation operation)
-        {
-            return GenerateLoadOrStore(context, operation, isStore: true);
-        }
-
-        public static string StoreLocal(CodeGenContext context, AstOperation operation)
-        {
-            return StoreLocalOrShared(context, operation, DefaultNames.LocalMemoryName);
-        }
-
-        public static string StoreShared(CodeGenContext context, AstOperation operation)
-        {
-            return StoreLocalOrShared(context, operation, DefaultNames.SharedMemoryName);
-        }
-
-        private static string StoreLocalOrShared(CodeGenContext context, AstOperation operation, string arrayName)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-
-            string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src2);
-
-            string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32);
-
-            return $"{arrayName}[{offsetExpr}] = {src}";
-        }
-
-        public static string StoreShared16(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-
-            string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src2);
-
-            string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32);
-
-            return $"{HelperFunctionNames.StoreShared16}({offsetExpr}, {src})";
-        }
-
-        public static string StoreShared8(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-
-            string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src2);
-
-            string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32);
-
-            return $"{HelperFunctionNames.StoreShared8}({offsetExpr}, {src})";
-        }
-
-        public static string StoreStorage(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-            IAstNode src3 = operation.GetSource(2);
-
-            string indexExpr  = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-            string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src3);
-
-            string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32);
-
-            string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage);
-
-            return $"{sb} = {src}";
-        }
-
-        public static string StoreStorage16(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-            IAstNode src3 = operation.GetSource(2);
-
-            string indexExpr  = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-            string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src3);
-
-            string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32);
-
-            string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage);
-
-            return $"{HelperFunctionNames.StoreStorage16}({indexExpr}, {offsetExpr}, {src})";
-        }
-
-        public static string StoreStorage8(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src1 = operation.GetSource(0);
-            IAstNode src2 = operation.GetSource(1);
-            IAstNode src3 = operation.GetSource(2);
-
-            string indexExpr  = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0));
-            string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1));
-
-            AggregateType srcType = OperandManager.GetNodeDestType(context, src3);
-
-            string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32);
-
-            string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage);
-
-            return $"{HelperFunctionNames.StoreStorage8}({indexExpr}, {offsetExpr}, {src})";
-        }
-
-        public static string TextureSample(CodeGenContext context, AstOperation operation)
-        {
-            AstTextureOperation texOp = (AstTextureOperation)operation;
-
-            bool isBindless     = (texOp.Flags & TextureFlags.Bindless)    != 0;
-            bool isGather       = (texOp.Flags & TextureFlags.Gather)      != 0;
-            bool hasDerivatives = (texOp.Flags & TextureFlags.Derivatives) != 0;
-            bool intCoords      = (texOp.Flags & TextureFlags.IntCoords)   != 0;
-            bool hasLodBias     = (texOp.Flags & TextureFlags.LodBias)     != 0;
-            bool hasLodLevel    = (texOp.Flags & TextureFlags.LodLevel)    != 0;
-            bool hasOffset      = (texOp.Flags & TextureFlags.Offset)      != 0;
-            bool hasOffsets     = (texOp.Flags & TextureFlags.Offsets)     != 0;
-
-            bool isArray       = (texOp.Type & SamplerType.Array)       != 0;
-            bool isIndexed     = (texOp.Type & SamplerType.Indexed)     != 0;
-            bool isMultisample = (texOp.Type & SamplerType.Multisample) != 0;
-            bool isShadow      = (texOp.Type & SamplerType.Shadow)      != 0;
-
-            bool colorIsVector = isGather || !isShadow;
-
-            SamplerType type = texOp.Type & SamplerType.Mask;
-
-            bool is2D   = type == SamplerType.Texture2D;
-            bool isCube = type == SamplerType.TextureCube;
-
-            // 2D Array and Cube shadow samplers with LOD level or bias requires an extension.
-            // If the extension is not supported, just remove the LOD parameter.
-            if (isArray && isShadow && (is2D || isCube) && !context.Config.GpuAccessor.QueryHostSupportsTextureShadowLod())
-            {
-                hasLodBias = false;
-                hasLodLevel = false;
-            }
-
-            // Cube shadow samplers with LOD level requires an extension.
-            // If the extension is not supported, just remove the LOD level parameter.
-            if (isShadow && isCube && !context.Config.GpuAccessor.QueryHostSupportsTextureShadowLod())
-            {
-                hasLodLevel = false;
-            }
-
-            // TODO: Bindless texture support. For now we just return 0.
-            if (isBindless)
-            {
-                string scalarValue = NumberFormatter.FormatFloat(0);
-
-                if (colorIsVector)
-                {
-                    AggregateType outputType = texOp.GetVectorType(AggregateType.FP32);
-
-                    if ((outputType & AggregateType.ElementCountMask) != 0)
-                    {
-                        return $"{Declarations.GetVarTypeName(context, outputType, precise: false)}({scalarValue})";
-                    }
-                }
-
-                return scalarValue;
-            }
-
-            string texCall = intCoords ? "texelFetch" : "texture";
-
-            if (isGather)
-            {
-                texCall += "Gather";
-            }
-            else if (hasDerivatives)
-            {
-                texCall += "Grad";
-            }
-            else if (hasLodLevel && !intCoords)
-            {
-                texCall += "Lod";
-            }
-
-            if (hasOffset)
-            {
-                texCall += "Offset";
-            }
-            else if (hasOffsets)
-            {
-                texCall += "Offsets";
-            }
-
-            int srcIndex = isBindless ? 1 : 0;
-
-            string Src(AggregateType type)
-            {
-                return GetSoureExpr(context, texOp.GetSource(srcIndex++), type);
-            }
-
-            string indexExpr = null;
-
-            if (isIndexed)
-            {
-                indexExpr = Src(AggregateType.S32);
-            }
-
-            string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr);
-
-            texCall += "(" + samplerName;
-
-            int coordsCount = texOp.Type.GetDimensions();
-
-            int pCount = coordsCount;
-
-            int arrayIndexElem = -1;
-
-            if (isArray)
-            {
-                arrayIndexElem = pCount++;
-            }
-
-            // The sampler 1D shadow overload expects a
-            // dummy value on the middle of the vector, who knows why...
-            bool hasDummy1DShadowElem = texOp.Type == (SamplerType.Texture1D | SamplerType.Shadow);
-
-            if (hasDummy1DShadowElem)
-            {
-                pCount++;
-            }
-
-            if (isShadow && !isGather)
-            {
-                pCount++;
-            }
-
-            // On textureGather*, the comparison value is
-            // always specified as an extra argument.
-            bool hasExtraCompareArg = isShadow && isGather;
-
-            if (pCount == 5)
-            {
-                pCount = 4;
-
-                hasExtraCompareArg = true;
-            }
-
-            void Append(string str)
-            {
-                texCall += ", " + str;
-            }
-
-            AggregateType coordType = intCoords ? AggregateType.S32 : AggregateType.FP32;
-
-            string AssemblePVector(int count)
-            {
-                if (count > 1)
-                {
-                    string[] elems = new string[count];
-
-                    for (int index = 0; index < count; index++)
-                    {
-                        if (arrayIndexElem == index)
-                        {
-                            elems[index] = Src(AggregateType.S32);
-
-                            if (!intCoords)
-                            {
-                                elems[index] = "float(" + elems[index] + ")";
-                            }
-                        }
-                        else if (index == 1 && hasDummy1DShadowElem)
-                        {
-                            elems[index] = NumberFormatter.FormatFloat(0);
-                        }
-                        else
-                        {
-                            elems[index] = Src(coordType);
-                        }
-                    }
-
-                    string prefix = intCoords ? "i" : string.Empty;
-
-                    return prefix + "vec" + count + "(" + string.Join(", ", elems) + ")";
-                }
-                else
-                {
-                    return Src(coordType);
-                }
-            }
-
-            string ApplyScaling(string vector)
-            {
-                if (intCoords)
-                {
-                    if (context.Config.Stage.SupportsRenderScale() &&
-                        !isBindless &&
-                        !isIndexed)
-                    {
-                        int index = context.Config.FindTextureDescriptorIndex(texOp);
-
-                        if (pCount == 3 && isArray)
-                        {
-                            // The array index is not scaled, just x and y.
-                            vector = "ivec3(Helper_TexelFetchScale((" + vector + ").xy, " + index + "), (" + vector + ").z)";
-                        }
-                        else if (pCount == 2 && !isArray)
-                        {
-                            vector = "Helper_TexelFetchScale(" + vector + ", " + index + ")";
-                        }
-                    }
-                }
-
-                return vector;
-            }
-
-            string ApplyBias(string vector)
-            {
-                int gatherBiasPrecision = context.Config.GpuAccessor.QueryHostGatherBiasPrecision();
-                if (isGather && gatherBiasPrecision != 0)
-                {
-                    // GPU requires texture gather to be slightly offset to match NVIDIA behaviour when point is exactly between two texels.
-                    // Offset by the gather precision divided by 2 to correct for rounding.
-
-                    if (pCount == 1)
-                    {
-                        vector = $"{vector} + (1.0 / (float(textureSize({samplerName}, 0)) * float({1 << (gatherBiasPrecision + 1)})))";
-                    }
-                    else
-                    {
-                        vector = $"{vector} + (1.0 / (vec{pCount}(textureSize({samplerName}, 0).{"xyz".Substring(0, pCount)}) * float({1 << (gatherBiasPrecision + 1)})))";
-                    }
-                }
-
-                return vector;
-            }
-
-            Append(ApplyBias(ApplyScaling(AssemblePVector(pCount))));
-
-            string AssembleDerivativesVector(int count)
-            {
-                if (count > 1)
-                {
-                    string[] elems = new string[count];
-
-                    for (int index = 0; index < count; index++)
-                    {
-                        elems[index] = Src(AggregateType.FP32);
-                    }
-
-                    return "vec" + count + "(" + string.Join(", ", elems) + ")";
-                }
-                else
-                {
-                    return Src(AggregateType.FP32);
-                }
-            }
-
-            if (hasExtraCompareArg)
-            {
-                Append(Src(AggregateType.FP32));
-            }
-
-            if (hasDerivatives)
-            {
-                Append(AssembleDerivativesVector(coordsCount)); // dPdx
-                Append(AssembleDerivativesVector(coordsCount)); // dPdy
-            }
-
-            if (isMultisample)
-            {
-                Append(Src(AggregateType.S32));
-            }
-            else if (hasLodLevel)
-            {
-                Append(Src(coordType));
-            }
-
-            string AssembleOffsetVector(int count)
-            {
-                if (count > 1)
-                {
-                    string[] elems = new string[count];
-
-                    for (int index = 0; index < count; index++)
-                    {
-                        elems[index] = Src(AggregateType.S32);
-                    }
-
-                    return "ivec" + count + "(" + string.Join(", ", elems) + ")";
-                }
-                else
-                {
-                    return Src(AggregateType.S32);
-                }
-            }
-
-            if (hasOffset)
-            {
-                Append(AssembleOffsetVector(coordsCount));
-            }
-            else if (hasOffsets)
-            {
-                texCall += $", ivec{coordsCount}[4](";
-
-                texCall += AssembleOffsetVector(coordsCount) + ", ";
-                texCall += AssembleOffsetVector(coordsCount) + ", ";
-                texCall += AssembleOffsetVector(coordsCount) + ", ";
-                texCall += AssembleOffsetVector(coordsCount) + ")";
-            }
-
-            if (hasLodBias)
-            {
-               Append(Src(AggregateType.FP32));
-            }
-
-            // textureGather* optional extra component index,
-            // not needed for shadow samplers.
-            if (isGather && !isShadow)
-            {
-               Append(Src(AggregateType.S32));
-            }
-
-            texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : "");
-
-            return texCall;
-        }
-
-        public static string TextureSize(CodeGenContext context, AstOperation operation)
-        {
-            AstTextureOperation texOp = (AstTextureOperation)operation;
-
-            bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
-
-            // TODO: Bindless texture support. For now we just return 0.
-            if (isBindless)
-            {
-                return NumberFormatter.FormatInt(0);
-            }
-
-            bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0;
-
-            string indexExpr = null;
-
-            if (isIndexed)
-            {
-                indexExpr = GetSoureExpr(context, texOp.GetSource(0), AggregateType.S32);
-            }
-
-            string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr);
-
-            if (texOp.Index == 3)
-            {
-                return $"textureQueryLevels({samplerName})";
-            }
-            else
-            {
-                (TextureDescriptor descriptor, int descriptorIndex) = context.Config.FindTextureDescriptor(texOp);
-                bool hasLod = !descriptor.Type.HasFlag(SamplerType.Multisample) && descriptor.Type != SamplerType.TextureBuffer;
-                string texCall;
-
-                if (hasLod)
-                {
-                    int lodSrcIndex = isBindless || isIndexed ? 1 : 0;
-                    IAstNode lod = operation.GetSource(lodSrcIndex);
-                    string lodExpr = GetSoureExpr(context, lod, GetSrcVarType(operation.Inst, lodSrcIndex));
-
-                    texCall = $"textureSize({samplerName}, {lodExpr}){GetMask(texOp.Index)}";
-                }
-                else
-                {
-                    texCall = $"textureSize({samplerName}){GetMask(texOp.Index)}";
-                }
-
-                if (context.Config.Stage.SupportsRenderScale() &&
-                    (texOp.Index < 2 || (texOp.Type & SamplerType.Mask) == SamplerType.Texture3D) &&
-                    !isBindless &&
-                    !isIndexed)
-                {
-                    texCall = $"Helper_TextureSizeUnscale({texCall}, {descriptorIndex})";
-                }
-
-                return texCall;
-            }
-        }
-
-        private static string GenerateLoadOrStore(CodeGenContext context, AstOperation operation, bool isStore)
-        {
-            StorageKind storageKind = operation.StorageKind;
-
-            string varName;
-            AggregateType varType;
-            int srcIndex = 0;
-
-            switch (storageKind)
-            {
-                case StorageKind.Input:
-                case StorageKind.InputPerPatch:
-                case StorageKind.Output:
-                case StorageKind.OutputPerPatch:
-                    if (!(operation.GetSource(srcIndex++) is AstOperand varId) || varId.Type != OperandType.Constant)
-                    {
-                        throw new InvalidOperationException($"First input of {operation.Inst} with {storageKind} storage must be a constant operand.");
-                    }
-
-                    IoVariable ioVariable = (IoVariable)varId.Value;
-                    bool isOutput = storageKind.IsOutput();
-                    bool isPerPatch = storageKind.IsPerPatch();
-                    int location = -1;
-                    int component = 0;
-
-                    if (context.Config.HasPerLocationInputOrOutput(ioVariable, isOutput))
-                    {
-                        if (!(operation.GetSource(srcIndex++) is AstOperand vecIndex) || vecIndex.Type != OperandType.Constant)
-                        {
-                            throw new InvalidOperationException($"Second input of {operation.Inst} with {storageKind} storage must be a constant operand.");
-                        }
-
-                        location = vecIndex.Value;
-
-                        if (operation.SourcesCount > srcIndex &&
-                            operation.GetSource(srcIndex) is AstOperand elemIndex &&
-                            elemIndex.Type == OperandType.Constant &&
-                            context.Config.HasPerLocationInputOrOutputComponent(ioVariable, location, elemIndex.Value, isOutput))
-                        {
-                            component = elemIndex.Value;
-                            srcIndex++;
-                        }
-                    }
-
-                    (varName, varType) = IoMap.GetGlslVariable(context.Config, ioVariable, location, component, isOutput, isPerPatch);
-
-                    if (IoMap.IsPerVertexBuiltIn(context.Config.Stage, ioVariable, isOutput))
-                    {
-                        // Since those exist both as input and output on geometry and tessellation shaders,
-                        // we need the gl_in and gl_out prefixes to disambiguate.
-
-                        if (storageKind == StorageKind.Input)
-                        {
-                            string expr = GetSoureExpr(context, operation.GetSource(srcIndex++), AggregateType.S32);
-                            varName = $"gl_in[{expr}].{varName}";
-                        }
-                        else if (storageKind == StorageKind.Output)
-                        {
-                            string expr = GetSoureExpr(context, operation.GetSource(srcIndex++), AggregateType.S32);
-                            varName = $"gl_out[{expr}].{varName}";
-                        }
-                    }
-
-                    int firstSrcIndex = srcIndex;
-                    int inputsCount = isStore ? operation.SourcesCount - 1 : operation.SourcesCount;
-
-                    for (; srcIndex < inputsCount; srcIndex++)
-                    {
-                        IAstNode src = operation.GetSource(srcIndex);
-
-                        if ((varType & AggregateType.ElementCountMask) != 0 &&
-                            srcIndex == inputsCount - 1 &&
-                            src is AstOperand elementIndex &&
-                            elementIndex.Type == OperandType.Constant)
-                        {
-                            varName += "." + "xyzw"[elementIndex.Value & 3];
-                        }
-                        else if (srcIndex == firstSrcIndex && context.Config.Stage == ShaderStage.TessellationControl && storageKind == StorageKind.Output)
-                        {
-                            // GLSL requires that for tessellation control shader outputs,
-                            // that the index expression must be *exactly* "gl_InvocationID",
-                            // otherwise the compilation fails.
-                            // TODO: Get rid of this and use expression propagation to make sure we generate the correct code from IR.
-                            varName += "[gl_InvocationID]";
-                        }
-                        else
-                        {
-                            varName += $"[{GetSoureExpr(context, src, AggregateType.S32)}]";
-                        }
-                    }
-                    break;
-
-                default:
-                    throw new InvalidOperationException($"Invalid storage kind {storageKind}.");
-            }
-
-            if (isStore)
-            {
-                varType &= AggregateType.ElementTypeMask;
-                varName = $"{varName} = {GetSoureExpr(context, operation.GetSource(srcIndex), varType)}";
-            }
-
-            return varName;
-        }
-
-        private static string GetStorageBufferAccessor(string slotExpr, string offsetExpr, ShaderStage stage)
-        {
-            string sbName = OperandManager.GetShaderStagePrefix(stage);
-
-            sbName += "_" + DefaultNames.StorageNamePrefix;
-
-            return $"{sbName}[{slotExpr}].{DefaultNames.DataName}[{offsetExpr}]";
-        }
-
-        private static string GetMask(int index)
-        {
-            return $".{"rgba".AsSpan(index, 1)}";
-        }
-
-        private static string GetMaskMultiDest(int mask)
-        {
-            string swizzle = ".";
-
-            for (int i = 0; i < 4; i++)
-            {
-                if ((mask & (1 << i)) != 0)
-                {
-                    swizzle += "xyzw"[i];
-                }
-            }
-
-            return swizzle;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs
deleted file mode 100644
index 5a888e9c..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Ryujinx.Graphics.Shader.StructuredIr;
-using System;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenPacking
-    {
-        public static string PackDouble2x32(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src0 = operation.GetSource(0);
-            IAstNode src1 = operation.GetSource(1);
-
-            string src0Expr = GetSoureExpr(context, src0, GetSrcVarType(operation.Inst, 0));
-            string src1Expr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 1));
-
-            return $"packDouble2x32(uvec2({src0Expr}, {src1Expr}))";
-        }
-
-        public static string PackHalf2x16(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src0 = operation.GetSource(0);
-            IAstNode src1 = operation.GetSource(1);
-
-            string src0Expr = GetSoureExpr(context, src0, GetSrcVarType(operation.Inst, 0));
-            string src1Expr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 1));
-
-            return $"packHalf2x16(vec2({src0Expr}, {src1Expr}))";
-        }
-
-        public static string UnpackDouble2x32(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src = operation.GetSource(0);
-
-            string srcExpr = GetSoureExpr(context, src, GetSrcVarType(operation.Inst, 0));
-
-            return $"unpackDouble2x32({srcExpr}){GetMask(operation.Index)}";
-        }
-
-        public static string UnpackHalf2x16(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode src = operation.GetSource(0);
-
-            string srcExpr = GetSoureExpr(context, src, GetSrcVarType(operation.Inst, 0));
-
-            return $"unpackHalf2x16({srcExpr}){GetMask(operation.Index)}";
-        }
-
-        private static string GetMask(int index)
-        {
-            return $".{"xy".AsSpan(index, 1)}";
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs
deleted file mode 100644
index f09ea2e8..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.StructuredIr;
-
-using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper;
-using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class InstGenVector
-    {
-        public static string VectorExtract(CodeGenContext context, AstOperation operation)
-        {
-            IAstNode vector = operation.GetSource(0);
-            IAstNode index = operation.GetSource(1);
-
-            string vectorExpr = GetSoureExpr(context, vector, OperandManager.GetNodeDestType(context, vector));
-
-            if (index is AstOperand indexOperand && indexOperand.Type == OperandType.Constant)
-            {
-                char elem = "xyzw"[indexOperand.Value];
-
-                return $"{vectorExpr}.{elem}";
-            }
-            else
-            {
-                string indexExpr = GetSoureExpr(context, index, GetSrcVarType(operation.Inst, 1));
-
-                return $"{vectorExpr}[{indexExpr}]";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs
deleted file mode 100644
index 7b2a6b46..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    readonly struct InstInfo
-    {
-        public InstType Type { get; }
-
-        public string OpName { get; }
-
-        public int Precedence { get; }
-
-        public InstInfo(InstType type, string opName, int precedence)
-        {
-            Type       = type;
-            OpName     = opName;
-            Precedence = precedence;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs
deleted file mode 100644
index 84e36cdd..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    [Flags]
-    enum InstType
-    {
-        OpNullary   = Op | 0,
-        OpUnary     = Op | 1,
-        OpBinary    = Op | 2,
-        OpBinaryCom = Op | 2 | Commutative,
-        OpTernary   = Op | 3,
-
-        CallNullary    = Call | 0,
-        CallUnary      = Call | 1,
-        CallBinary     = Call | 2,
-        CallTernary    = Call | 3,
-        CallQuaternary = Call | 4,
-
-        // The atomic instructions have one extra operand,
-        // for the storage slot and offset pair.
-        AtomicBinary  = Call | Atomic | 3,
-        AtomicTernary = Call | Atomic | 4,
-
-        Commutative = 1 << 8,
-        Op          = 1 << 9,
-        Call        = 1 << 10,
-        Atomic      = 1 << 11,
-        Special     = 1 << 12,
-
-        ArityMask = 0xff
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs
deleted file mode 100644
index 093ee232..00000000
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using Ryujinx.Graphics.Shader.IntermediateRepresentation;
-using Ryujinx.Graphics.Shader.Translation;
-using System.Globalization;
-
-namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
-{
-    static class IoMap
-    {
-        public static (string, AggregateType) GetGlslVariable(
-            ShaderConfig config,
-            IoVariable ioVariable,
-            int location,
-            int component,
-            bool isOutput,
-            bool isPerPatch)
-        {
-            return ioVariable switch
-            {
-                IoVariable.BackColorDiffuse => ("gl_BackColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated.
-                IoVariable.BackColorSpecular => ("gl_BackSecondaryColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated.
-                IoVariable.BaseInstance => ("gl_BaseInstanceARB", AggregateType.S32),
-                IoVariable.BaseVertex => ("gl_BaseVertexARB", AggregateType.S32),
-                IoVariable.ClipDistance => ("gl_ClipDistance", AggregateType.Array | AggregateType.FP32),
-                IoVariable.CtaId => ("gl_WorkGroupID", AggregateType.Vector3 | AggregateType.U32),
-                IoVariable.DrawIndex => ("gl_DrawIDARB", AggregateType.S32),
-                IoVariable.FogCoord => ("gl_FogFragCoord", AggregateType.FP32), // Deprecated.
-                IoVariable.FragmentCoord => ("gl_FragCoord", AggregateType.Vector4 | AggregateType.FP32),
-                IoVariable.FragmentOutputColor => GetFragmentOutputColorVariableName(config, location),
-                IoVariable.FragmentOutputDepth => ("gl_FragDepth", AggregateType.FP32),
-                IoVariable.FragmentOutputIsBgra => (DefaultNames.SupportBlockIsBgraName, AggregateType.Array | AggregateType.Bool),
-                IoVariable.FrontColorDiffuse => ("gl_FrontColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated.
-                IoVariable.FrontColorSpecular  => ("gl_FrontSecondaryColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated.
-                IoVariable.FrontFacing => ("gl_FrontFacing", AggregateType.Bool),
-                IoVariable.InstanceId => ("gl_InstanceID", AggregateType.S32),
-                IoVariable.InstanceIndex => ("gl_InstanceIndex", AggregateType.S32),
-                IoVariable.InvocationId => ("gl_InvocationID", AggregateType.S32),
-                IoVariable.Layer => ("gl_Layer", AggregateType.S32),
-                IoVariable.PatchVertices => ("gl_PatchVerticesIn", AggregateType.S32),
-                IoVariable.PointCoord => ("gl_PointCoord", AggregateType.Vector2 | AggregateType.FP32),
-                IoVariable.PointSize => ("gl_PointSize", AggregateType.FP32),
-                IoVariable.Position => ("gl_Position", AggregateType.Vector4 | AggregateType.FP32),
-                IoVariable.PrimitiveId => GetPrimitiveIdVariableName(config.Stage, isOutput),
-                IoVariable.SubgroupEqMask => GetSubgroupMaskVariableName(config, "Eq"),
-                IoVariable.SubgroupGeMask => GetSubgroupMaskVariableName(config, "Ge"),
-                IoVariable.SubgroupGtMask => GetSubgroupMaskVariableName(config, "Gt"),
-                IoVariable.SubgroupLaneId => GetSubgroupInvocationIdVariableName(config),
-                IoVariable.SubgroupLeMask => GetSubgroupMaskVariableName(config, "Le"),
-                IoVariable.SubgroupLtMask => GetSubgroupMaskVariableName(config, "Lt"),
-                IoVariable.SupportBlockRenderScale => (DefaultNames.SupportBlockRenderScaleName, AggregateType.Array | AggregateType.FP32),
-                IoVariable.SupportBlockViewInverse => (DefaultNames.SupportBlockViewportInverse, AggregateType.Vector2 | AggregateType.FP32),
-                IoVariable.TessellationCoord => ("gl_TessCoord", AggregateType.Vector3 | AggregateType.FP32),
-                IoVariable.TessellationLevelInner => ("gl_TessLevelInner", AggregateType.Array | AggregateType.FP32),
-                IoVariable.TessellationLevelOuter => ("gl_TessLevelOuter", AggregateType.Array | AggregateType.FP32),
-                IoVariable.TextureCoord => ("gl_TexCoord", AggregateType.Array | AggregateType.Vector4 | AggregateType.FP32), // Deprecated.
-                IoVariable.ThreadId => ("gl_LocalInvocationID", AggregateType.Vector3 | AggregateType.U32),
-                IoVariable.ThreadKill => ("gl_HelperInvocation", AggregateType.Bool),
-                IoVariable.UserDefined => GetUserDefinedVariableName(config, location, component, isOutput, isPerPatch),
-                IoVariable.VertexId => ("gl_VertexID", AggregateType.S32),
-                IoVariable.VertexIndex => ("gl_VertexIndex", AggregateType.S32),
-                IoVariable.ViewportIndex => ("gl_ViewportIndex", AggregateType.S32),
-                IoVariable.ViewportMask => ("gl_ViewportMask", AggregateType.Array | AggregateType.S32),
-                _ => (null, AggregateType.Invalid)
-            };
-        }
-
-        public static bool IsPerVertexBuiltIn(ShaderStage stage, IoVariable ioVariable, bool isOutput)
-        {
-            switch (ioVariable)
-            {
-                case IoVariable.Layer:
-                case IoVariable.ViewportIndex:
-                case IoVariable.PointSize:
-                case IoVariable.Position:
-                case IoVariable.ClipDistance:
-                case IoVariable.PointCoord:
-                case IoVariable.ViewportMask:
-                    if (isOutput)
-                    {
-                        return stage == ShaderStage.TessellationControl;
-                    }
-                    else
-                    {
-                        return stage == ShaderStage.TessellationControl ||
-                               stage == ShaderStage.TessellationEvaluation ||
-                               stage == ShaderStage.Geometry;
-                    }
-            }
-
-            return false;
-        }
-
-        private static (string, AggregateType) GetFragmentOutputColorVariableName(ShaderConfig config, int location)
-        {
-            if (location < 0)
-            {
-                return (DefaultNames.OAttributePrefix, config.GetFragmentOutputColorType(0));
-            }
-
-            string name = DefaultNames.OAttributePrefix + location.ToString(CultureInfo.InvariantCulture);
-
-            return (name, config.GetFragmentOutputColorType(location));
-        }
-
-        private static (string, AggregateType) GetPrimitiveIdVariableName(ShaderStage stage, bool isOutput)
-        {
-            // The geometry stage has an additional gl_PrimitiveIDIn variable.
-            return (isOutput || stage != ShaderStage.Geometry ? "gl_PrimitiveID" : "gl_PrimitiveIDIn", AggregateType.S32);
-        }
-
-        private static (string, AggregateType) GetSubgroupMaskVariableName(ShaderConfig config, string cc)
-        {
-            return config.GpuAccessor.QueryHostSupportsShaderBallot()
-                ? ($"unpackUint2x32(gl_SubGroup{cc}MaskARB)", AggregateType.Vector2 | AggregateType.U32)
-                : ($"gl_Subgroup{cc}Mask", AggregateType.Vector4 | AggregateType.U32);
-        }
-
-        private static (string, AggregateType) GetSubgroupInvocationIdVariableName(ShaderConfig config)
-        {
-            return config.GpuAccessor.QueryHostSupportsShaderBallot()
-                ? ("gl_SubGroupInvocationARB", AggregateType.U32)
-                : ("gl_SubgroupInvocationID", AggregateType.U32);
-        }
-
-        private static (string, AggregateType) GetUserDefinedVariableName(ShaderConfig config, int location, int component, bool isOutput, bool isPerPatch)
-        {
-            string name = isPerPatch
-                ? DefaultNames.PerPatchAttributePrefix
-                : (isOutput ? DefaultNames.OAttributePrefix : DefaultNames.IAttributePrefix);
-
-            if (location < 0)
-            {
-                return (name, config.GetUserDefinedType(0, isOutput));
-            }
-
-            name += location.ToString(CultureInfo.InvariantCulture);
-
-            if (config.HasPerLocationInputOrOutputComponent(IoVariable.UserDefined, location, component, isOutput))
-            {
-                name += "_" + "xyzw"[component & 3];
-            }
-
-            return (name, config.GetUserDefinedType(location, isOutput));
-        }
-    }
-}
\ No newline at end of file