Refactor DefaultShuffleX to use constants.

Author: JimBobSquarePants

src/ImageSharp/Common/Helpers/Shuffle/IComponentShuffle.cs

@@ -46,23 +46,10 @@ internal interface IShuffle4 : IComponentShuffle
 
 internal readonly struct DefaultShuffle4 : IShuffle4
 {
-    private readonly byte p3;
-    private readonly byte p2;
-    private readonly byte p1;
-    private readonly byte p0;
-
-    public DefaultShuffle4(byte p3, byte p2, byte p1, byte p0)
+    public DefaultShuffle4(byte control)
     {
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p3, 0, 3, nameof(p3));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p2, 0, 3, nameof(p2));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p1, 0, 3, nameof(p1));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p0, 0, 3, nameof(p0));
-
-        this.p3 = p3;
-        this.p2 = p2;
-        this.p1 = p1;
-        this.p0 = p0;
-        this.Control = Shuffle.MmShuffle(p3, p2, p1, p0);
+        DebugGuard.MustBeBetweenOrEqualTo<byte>(control, 0, 3, nameof(control));
+        this.Control = control;
     }
 
     public byte Control { get; }
@@ -77,10 +64,7 @@ public void RunFallbackShuffle(ReadOnlySpan<byte> source, Span<byte> dest)
         ref byte sBase = ref MemoryMarshal.GetReference(source);
         ref byte dBase = ref MemoryMarshal.GetReference(dest);
 
-        int p3 = this.p3;
-        int p2 = this.p2;
-        int p1 = this.p1;
-        int p0 = this.p0;
+        Shuffle.InverseMmShuffle(this.Control, out int p3, out int p2, out int p1, out int p0);
 
         for (int i = 0; i < source.Length; i += 4)
         {

src/ImageSharp/Common/Helpers/Shuffle/IPad3Shuffle4.cs

@@ -14,23 +14,10 @@ internal interface IPad3Shuffle4 : IComponentShuffle
 
 internal readonly struct DefaultPad3Shuffle4 : IPad3Shuffle4
 {
-    private readonly byte p3;
-    private readonly byte p2;
-    private readonly byte p1;
-    private readonly byte p0;
-
-    public DefaultPad3Shuffle4(byte p3, byte p2, byte p1, byte p0)
+    public DefaultPad3Shuffle4(byte control)
     {
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p3, 0, 3, nameof(p3));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p2, 0, 3, nameof(p2));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p1, 0, 3, nameof(p1));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p0, 0, 3, nameof(p0));
-
-        this.p3 = p3;
-        this.p2 = p2;
-        this.p1 = p1;
-        this.p0 = p0;
-        this.Control = Shuffle.MmShuffle(p3, p2, p1, p0);
+        DebugGuard.MustBeBetweenOrEqualTo<byte>(control, 0, 3, nameof(control));
+        this.Control = control;
     }
 
     public byte Control { get; }
@@ -45,10 +32,7 @@ public void RunFallbackShuffle(ReadOnlySpan<byte> source, Span<byte> dest)
         ref byte sBase = ref MemoryMarshal.GetReference(source);
         ref byte dBase = ref MemoryMarshal.GetReference(dest);
 
-        int p3 = this.p3;
-        int p2 = this.p2;
-        int p1 = this.p1;
-        int p0 = this.p0;
+        Shuffle.InverseMmShuffle(this.Control, out int p3, out int p2, out int p1, out int p0);
 
         Span<byte> temp = stackalloc byte[4];
         ref byte t = ref MemoryMarshal.GetReference(temp);

src/ImageSharp/Common/Helpers/Shuffle/IShuffle3.cs

@@ -14,20 +14,10 @@ internal interface IShuffle3 : IComponentShuffle
 
 internal readonly struct DefaultShuffle3 : IShuffle3
 {
-    private readonly byte p2;
-    private readonly byte p1;
-    private readonly byte p0;
-
-    public DefaultShuffle3(byte p2, byte p1, byte p0)
+    public DefaultShuffle3(byte control)
     {
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p2, 0, 2, nameof(p2));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p1, 0, 2, nameof(p1));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p0, 0, 2, nameof(p0));
-
-        this.p2 = p2;
-        this.p1 = p1;
-        this.p0 = p0;
-        this.Control = Shuffle.MmShuffle(3, p2, p1, p0);
+        DebugGuard.MustBeBetweenOrEqualTo<byte>(control, 0, 3, nameof(control));
+        this.Control = control;
     }
 
     public byte Control { get; }
@@ -42,9 +32,7 @@ public void RunFallbackShuffle(ReadOnlySpan<byte> source, Span<byte> dest)
         ref byte sBase = ref MemoryMarshal.GetReference(source);
         ref byte dBase = ref MemoryMarshal.GetReference(dest);
 
-        int p2 = this.p2;
-        int p1 = this.p1;
-        int p0 = this.p0;
+        Shuffle.InverseMmShuffle(this.Control, out _, out int p2, out int p1, out int p0);
 
         for (int i = 0; i < source.Length; i += 3)
         {

src/ImageSharp/Common/Helpers/Shuffle/IShuffle4Slice3.cs

@@ -14,21 +14,10 @@ internal interface IShuffle4Slice3 : IComponentShuffle
 
 internal readonly struct DefaultShuffle4Slice3 : IShuffle4Slice3
 {
-    private readonly byte p2;
-    private readonly byte p1;
-    private readonly byte p0;
-
-    public DefaultShuffle4Slice3(byte p3, byte p2, byte p1, byte p0)
+    public DefaultShuffle4Slice3(byte control)
     {
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p3, 0, 3, nameof(p3));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p2, 0, 3, nameof(p2));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p1, 0, 3, nameof(p1));
-        DebugGuard.MustBeBetweenOrEqualTo<byte>(p0, 0, 3, nameof(p0));
-
-        this.p2 = p2;
-        this.p1 = p1;
-        this.p0 = p0;
-        this.Control = Shuffle.MmShuffle(p3, p2, p1, p0);
+        DebugGuard.MustBeBetweenOrEqualTo<byte>(control, 0, 3, nameof(control));
+        this.Control = control;
     }
 
     public byte Control { get; }
@@ -43,9 +32,7 @@ public void RunFallbackShuffle(ReadOnlySpan<byte> source, Span<byte> dest)
         ref byte sBase = ref MemoryMarshal.GetReference(source);
         ref byte dBase = ref MemoryMarshal.GetReference(dest);
 
-        int p2 = this.p2;
-        int p1 = this.p1;
-        int p0 = this.p0;
+        Shuffle.InverseMmShuffle(this.Control, out _, out int p2, out int p1, out int p0);
 
         for (int i = 0, j = 0; i < dest.Length; i += 3, j += 4)
         {