replace FromScaledVector4() / ToScaledVector4() with flag usages

antonfirsov · antonfirsov · commit 877f31487c83 · 2019-03-31T23:28:34.000+02:00
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs
@@ -42,29 +42,16 @@ internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Argb32
             }
 
             /// <inheritdoc />
-            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels)
+            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors)
+            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);
             }
-
-            /// <inheritdoc />
-            internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels)
-            {
-                Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);
-            }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors)
-            {
-                Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
-            }
-
             /// <inheritdoc />
             internal override void ToRgba32(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Rgba32> destPixels)
             {
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs
@@ -42,30 +42,17 @@ internal override void ToBgr24(Configuration configuration, ReadOnlySpan<Bgr24>
             }
 
             /// <inheritdoc />
-            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels)
+            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors)
+            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);
             }
 
-            /// <inheritdoc />
-            internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels)
-            {
-                Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);
-            }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors)
-            {
-                Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
-            }
-
-
             /// <inheritdoc />
             internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Argb32> destPixels)
             {
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs
@@ -42,29 +42,16 @@ internal override void ToBgra32(Configuration configuration, ReadOnlySpan<Bgra32
             }
 
             /// <inheritdoc />
-            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgra32> destPixels)
+            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgra32> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Vector4> destVectors)
+            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);
             }
-
-            /// <inheritdoc />
-            internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgra32> destPixels)
-            {
-                Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);
-            }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Vector4> destVectors)
-            {
-                Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
-            }
-
             /// <inheritdoc />
             internal override void ToRgba32(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Rgba32> destPixels)
             {
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs
@@ -42,30 +42,17 @@ internal override void ToRgb24(Configuration configuration, ReadOnlySpan<Rgb24>
             }
 
             /// <inheritdoc />
-            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Rgb24> destPixels)
+            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Rgb24> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Vector4> destVectors)
+            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);
             }
 
-            /// <inheritdoc />
-            internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Rgb24> destPixels)
-            {
-                Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);
-            }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Vector4> destVectors)
-            {
-                Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
-            }
-
-
             /// <inheritdoc />
             internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Argb32> destPixels)
             {
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude
@@ -111,29 +111,16 @@ using System.Runtime.InteropServices;
     {
 #>
             /// <inheritdoc />
-            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels)
+            internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors)
+            internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);
             }
-
-            /// <inheritdoc />
-            internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels)
-            {
-                Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);
-            }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors)
-            {
-                Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);
-            }
-
 <#+
     }
 
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Rgba32.PixelOperations.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Rgba32.PixelOperations.cs
@@ -22,7 +22,8 @@ internal partial class PixelOperations : PixelOperations<Rgba32>
             internal override void ToVector4(
                 Configuration configuration,
                 ReadOnlySpan<Rgba32> sourcePixels,
-                Span<Vector4> destVectors)
+                Span<Vector4> destVectors,
+                PixelConversionModifiers modifiers)
             {
                 Guard.DestinationShouldNotBeTooShort(sourcePixels, destVectors, nameof(destVectors));
 
@@ -37,7 +38,8 @@ internal override void ToVector4(
             internal override void FromVector4(
                 Configuration configuration,
                 Span<Vector4> sourceVectors,
-                Span<Rgba32> destPixels)
+                Span<Rgba32> destPixels,
+                PixelConversionModifiers modifiers)
             {
                 Guard.DestinationShouldNotBeTooShort(sourceVectors, destPixels, nameof(destPixels));
 
@@ -47,24 +49,6 @@ internal override void FromVector4(
                     MemoryMarshal.Cast<Vector4, float>(sourceVectors),
                     MemoryMarshal.Cast<Rgba32, byte>(destPixels));
             }
-
-            /// <inheritdoc />
-            internal override void ToScaledVector4(
-                Configuration configuration,
-                ReadOnlySpan<Rgba32> sourceColors,
-                Span<Vector4> destinationVectors)
-            {
-                this.ToVector4(configuration, sourceColors, destinationVectors);
-            }
-
-            /// <inheritdoc />
-            internal override void FromScaledVector4(
-                Configuration configuration,
-                Span<Vector4> sourceVectors,
-                Span<Rgba32> destinationColors)
-            {
-                this.FromVector4(configuration, sourceVectors, destinationColors);
-            }
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/RgbaVector.PixelOperations.cs b/src/ImageSharp/PixelFormats/PixelImplementations/RgbaVector.PixelOperations.cs
@@ -18,32 +18,43 @@ public partial struct RgbaVector
         internal class PixelOperations : PixelOperations<RgbaVector>
         {
             /// <inheritdoc />
-            internal override void FromScaledVector4(
+            internal override void FromVector4(
                 Configuration configuration,
                 Span<Vector4> sourceVectors,
-                Span<RgbaVector> destinationColors)
+                Span<RgbaVector> destinationColors,
+                PixelConversionModifiers modifiers)
             {
                 Guard.DestinationShouldNotBeTooShort(sourceVectors, destinationColors, nameof(destinationColors));
 
-                MemoryMarshal.Cast<Vector4, RgbaVector>(sourceVectors).CopyTo(destinationColors);
+                // TODO: Repeating previous override behavior here. Not sure if this is correct!
+                if (modifiers.IsDefined(PixelConversionModifiers.Scale))
+                {
+                    MemoryMarshal.Cast<Vector4, RgbaVector>(sourceVectors).CopyTo(destinationColors);
+                }
+                else
+                {
+                    base.FromVector4(configuration, sourceVectors, destinationColors, modifiers);
+                }
             }
 
-            /// <inheritdoc />
-            internal override void ToScaledVector4(
-                Configuration configuration,
-                ReadOnlySpan<RgbaVector> sourceColors,
-                Span<Vector4> destinationVectors)
-                => this.ToVector4(configuration, sourceColors, destinationVectors);
-
             /// <inheritdoc />
             internal override void ToVector4(
                 Configuration configuration,
                 ReadOnlySpan<RgbaVector> sourcePixels,
-                Span<Vector4> destVectors)
+                Span<Vector4> destVectors,
+                PixelConversionModifiers modifiers)
             {
                 Guard.DestinationShouldNotBeTooShort(sourcePixels, destVectors, nameof(destVectors));
 
-                MemoryMarshal.Cast<RgbaVector, Vector4>(sourcePixels).CopyTo(destVectors);
+                // TODO: Repeating previous override behavior here. Not sure if this is correct!
+                if (modifiers.IsDefined(PixelConversionModifiers.Scale))
+                {
+                    base.ToVector4(configuration, sourcePixels, destVectors, modifiers);
+                }
+                else
+                {
+                    MemoryMarshal.Cast<RgbaVector, Vector4>(sourcePixels).CopyTo(destVectors);
+                }
             }
         }
     }
diff --git a/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.cs b/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.cs
diff --git a/src/ImageSharp/PixelFormats/Utils/Vector4Converters.RgbaCompatible.cs b/src/ImageSharp/PixelFormats/Utils/Vector4Converters.RgbaCompatible.cs

Original file line number	Diff line number	Diff line change
`@@ -42,29 +42,16 @@ internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Argb32`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/// <inheritdoc />`
`45`		`- internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels)`
	`45`	`+ internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)`
`46`	`46`	`{`
`47`	`47`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <inheritdoc />`
`51`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors)`
	`51`	`+ internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`52`	`52`	`{`
`53`	`53`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);`
`54`	`54`	`}`
`55`		`-`
`56`		`- /// <inheritdoc />`
`57`		`- internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels)`
`58`		`- {`
`59`		`- Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);`
`60`		`- }`
`61`		`-`
`62`		`- /// <inheritdoc />`
`63`		`- internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors)`
`64`		`- {`
`65`		`- Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);`
`66`		`- }`
`67`		`-`
`68`	`55`	`/// <inheritdoc />`
`69`	`56`	`internal override void ToRgba32(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Rgba32> destPixels)`
`70`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,30 +42,17 @@ internal override void ToBgr24(Configuration configuration, ReadOnlySpan<Bgr24>`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/// <inheritdoc />`
`45`		`- internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels)`
	`45`	`+ internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)`
`46`	`46`	`{`
`47`	`47`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <inheritdoc />`
`51`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors)`
	`51`	`+ internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`52`	`52`	`{`
`53`	`53`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);`
`54`	`54`	`}`
`55`	`55`
`56`		`- /// <inheritdoc />`
`57`		`- internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels)`
`58`		`- {`
`59`		`- Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);`
`60`		`- }`
`61`		`-`
`62`		`- /// <inheritdoc />`
`63`		`- internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors)`
`64`		`- {`
`65`		`- Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);`
`66`		`- }`
`67`		`-`
`68`		`-`
`69`	`56`	`/// <inheritdoc />`
`70`	`57`	`internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Argb32> destPixels)`
`71`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,29 +111,16 @@ using System.Runtime.InteropServices;`
`111`	`111`	`{`
`112`	`112`	`#>`
`113`	`113`	`/// <inheritdoc />`
`114`		`- internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels)`
	`114`	`+ internal override void FromVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)`
`115`	`115`	`{`
`116`	`116`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, false);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`/// <inheritdoc />`
`120`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors)`
	`120`	`+ internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`121`	`121`	`{`
`122`	`122`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, false);`
`123`	`123`	`}`
`124`		`-`
`125`		`- /// <inheritdoc />`
`126`		`- internal override void FromScaledVector4(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels)`
`127`		`- {`
`128`		`- Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, true);`
`129`		`- }`
`130`		`-`
`131`		`- /// <inheritdoc />`
`132`		`- internal override void ToScaledVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors)`
`133`		`- {`
`134`		`- Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, true);`
`135`		`- }`
`136`		`-`
`137`	`124`	`<#+`
`138`	`125`	`}`
`139`	`126`