5 files changed, 24 insertions, 22 deletions
diff --git a/src/Ryujinx.Graphics.Texture/Utils/BC67Utils.cs b/src/Ryujinx.Graphics.Texture/Utils/BC67Utils.cs
index e6c3f6e7..3f69cb4c 100644
--- a/src/Ryujinx.Graphics.Texture/Utils/BC67Utils.cs
+++ b/src/Ryujinx.Graphics.Texture/Utils/BC67Utils.cs
@@ -8,8 +8,8 @@ namespace Ryujinx.Graphics.Texture.Utils
 {
     static class BC67Utils
     {
-        private static byte[][] _quantizationLut;
-        private static byte[][] _quantizationLutNoPBit;
+        private static readonly byte[][] _quantizationLut;
+        private static readonly byte[][] _quantizationLutNoPBit;
 
         static BC67Utils()
         {
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Texture.Utils
             }
             else
             {
-                RgbaColor8 minColor = new RgbaColor8(255, 255, 255, 255);
+                RgbaColor8 minColor = new(255, 255, 255, 255);
                 RgbaColor8 maxColor = default;
 
                 for (int i = 0; i < tile.Length; i++)
@@ -1176,8 +1176,8 @@ namespace Ryujinx.Graphics.Texture.Utils
 
             int weight = (((weightIndex << 7) / ((1 << indexBitCount) - 1)) + 1) >> 1;
 
-            RgbaColor32 weightV = new RgbaColor32(weight);
-            RgbaColor32 invWeightV = new RgbaColor32(64 - weight);
+            RgbaColor32 weightV = new(weight);
+            RgbaColor32 invWeightV = new(64 - weight);
 
             return (color1 * invWeightV + color2 * weightV + new RgbaColor32(32)) >> 6;
         }
@@ -1197,8 +1197,10 @@ namespace Ryujinx.Graphics.Texture.Utils
             int colorWeight = BC67Tables.Weights[colorIndexBitCount - 2][colorWeightIndex];
             int alphaWeight = BC67Tables.Weights[alphaIndexBitCount - 2][alphaWeightIndex];
 
-            RgbaColor32 weightV = new RgbaColor32(colorWeight);
-            weightV.A = alphaWeight;
+            RgbaColor32 weightV = new(colorWeight)
+            {
+                A = alphaWeight
+            };
             RgbaColor32 invWeightV = new RgbaColor32(64) - weightV;
 
             return (color1 * invWeightV + color2 * weightV + new RgbaColor32(32)) >> 6;
diff --git a/src/Ryujinx.Graphics.Texture/Utils/BC7ModeInfo.cs b/src/Ryujinx.Graphics.Texture/Utils/BC7ModeInfo.cs
index 687df22c..91236f1b 100644
--- a/src/Ryujinx.Graphics.Texture/Utils/BC7ModeInfo.cs
+++ b/src/Ryujinx.Graphics.Texture/Utils/BC7ModeInfo.cs
@@ -34,4 +34,4 @@ namespace Ryujinx.Graphics.Texture.Utils
             AlphaDepth = alphaDepth;
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.Texture/Utils/Block.cs b/src/Ryujinx.Graphics.Texture/Utils/Block.cs
index a8bae077..3a1d50cd 100644
--- a/src/Ryujinx.Graphics.Texture/Utils/Block.cs
+++ b/src/Ryujinx.Graphics.Texture/Utils/Block.cs
@@ -25,7 +25,7 @@ namespace Ryujinx.Graphics.Texture.Utils
             offset += bits;
         }
 
-        public ulong Decode(ref int offset, int bits)
+        public readonly ulong Decode(ref int offset, int bits)
         {
             ulong value;
             ulong mask = bits == 64 ? ulong.MaxValue : (1UL << bits) - 1;
@@ -52,4 +52,4 @@ namespace Ryujinx.Graphics.Texture.Utils
             return value;
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.Texture/Utils/RgbaColor32.cs b/src/Ryujinx.Graphics.Texture/Utils/RgbaColor32.cs
index 582044d9..de7c9262 100644
--- a/src/Ryujinx.Graphics.Texture/Utils/RgbaColor32.cs
+++ b/src/Ryujinx.Graphics.Texture/Utils/RgbaColor32.cs
@@ -11,25 +11,25 @@ namespace Ryujinx.Graphics.Texture.Utils
 
         public int R
         {
-            get => _color.GetElement(0);
+            readonly get => _color.GetElement(0);
             set => _color = _color.WithElement(0, value);
         }
 
         public int G
         {
-            get => _color.GetElement(1);
+            readonly get => _color.GetElement(1);
             set => _color = _color.WithElement(1, value);
         }
 
         public int B
         {
-            get => _color.GetElement(2);
+            readonly get => _color.GetElement(2);
             set => _color = _color.WithElement(2, value);
         }
 
         public int A
         {
-            get => _color.GetElement(3);
+            readonly get => _color.GetElement(3);
             set => _color = _color.WithElement(3, value);
         }
 
@@ -180,7 +180,7 @@ namespace Ryujinx.Graphics.Texture.Utils
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RgbaColor8 GetColor8()
+        public readonly RgbaColor8 GetColor8()
         {
             if (Sse41.IsSupported)
             {
@@ -211,17 +211,17 @@ namespace Ryujinx.Graphics.Texture.Utils
             return (byte)Math.Clamp(value, 0, 255);
         }
 
-        public override int GetHashCode()
+        public readonly override int GetHashCode()
         {
             return HashCode.Combine(R, G, B, A);
         }
 
-        public override bool Equals(object obj)
+        public readonly override bool Equals(object obj)
         {
             return obj is RgbaColor32 other && Equals(other);
         }
 
-        public bool Equals(RgbaColor32 other)
+        public readonly bool Equals(RgbaColor32 other)
         {
             return _color.Equals(other._color);
         }
diff --git a/src/Ryujinx.Graphics.Texture/Utils/RgbaColor8.cs b/src/Ryujinx.Graphics.Texture/Utils/RgbaColor8.cs
index 0edf1cce..401bec38 100644
--- a/src/Ryujinx.Graphics.Texture/Utils/RgbaColor8.cs
+++ b/src/Ryujinx.Graphics.Texture/Utils/RgbaColor8.cs
@@ -54,22 +54,22 @@ namespace Ryujinx.Graphics.Texture.Utils
             return Unsafe.As<RgbaColor8, uint>(ref this);
         }
 
-        public override int GetHashCode()
+        public readonly override int GetHashCode()
         {
             return HashCode.Combine(R, G, B, A);
         }
 
-        public override bool Equals(object obj)
+        public readonly override bool Equals(object obj)
         {
             return obj is RgbaColor8 other && Equals(other);
         }
 
-        public bool Equals(RgbaColor8 other)
+        public readonly bool Equals(RgbaColor8 other)
         {
             return R == other.R && G == other.G && B == other.B && A == other.A;
         }
 
-        public byte GetComponent(int index)
+        public readonly byte GetComponent(int index)
         {
             return index switch
             {