Remove rasterizer config

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/Backends/DefaultDrawingBackend.cs

@@ -36,36 +36,10 @@ namespace SixLabors.ImageSharp.Drawing.Processing.Backends;
 /// </remarks>
 internal sealed class DefaultDrawingBackend : IDrawingBackend
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DefaultDrawingBackend"/> class.
-    /// </summary>
-    /// <param name="primaryRasterizer">Rasterizer used for coverage generation.</param>
-    private DefaultDrawingBackend(IRasterizer primaryRasterizer)
-    {
-        Guard.NotNull(primaryRasterizer, nameof(primaryRasterizer));
-        this.PrimaryRasterizer = primaryRasterizer;
-    }
-
     /// <summary>
     /// Gets the default backend instance.
     /// </summary>
-    public static DefaultDrawingBackend Instance { get; } = new(DefaultRasterizer.Instance);
-
-    /// <summary>
-    /// Gets the primary rasterizer used by this backend.
-    /// </summary>
-    public IRasterizer PrimaryRasterizer { get; }
-
-    /// <summary>
-    /// Creates a backend that uses the given rasterizer as the primary implementation.
-    /// </summary>
-    /// <param name="rasterizer">Primary rasterizer.</param>
-    /// <returns>A backend instance.</returns>
-    public static DefaultDrawingBackend Create(IRasterizer rasterizer)
-    {
-        Guard.NotNull(rasterizer, nameof(rasterizer));
-        return ReferenceEquals(rasterizer, DefaultRasterizer.Instance) ? Instance : new DefaultDrawingBackend(rasterizer);
-    }
+    public static DefaultDrawingBackend Instance { get; } = new();
 
     /// <inheritdoc />
     public bool IsCompositionBrushSupported<TPixel>(Brush brush)
@@ -201,7 +175,7 @@ internal void FlushPreparedBatch<TPixel>(
                 applicators,
                 destinationBounds,
                 definition.RasterizerOptions.Interest.Top);
-            this.PrimaryRasterizer.Rasterize(
+            DefaultRasterizer.Instance.Rasterize(
                 definition.Path,
                 definition.RasterizerOptions,
                 configuration.MemoryAllocator,

src/ImageSharp.Drawing/Processing/RasterizerDefaultsExtensions.cs

@@ -2,12 +2,11 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Drawing.Processing.Backends;
-using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
 
 /// <summary>
-/// Adds extensions that allow configuring the path rasterizer implementation.
+/// Adds extensions that allow configuring the drawing backend implementation.
 /// </summary>
 internal static class RasterizerDefaultsExtensions
 {
@@ -22,11 +21,6 @@ internal static IImageProcessingContext SetDrawingBackend(this IImageProcessingC
         Guard.NotNull(backend, nameof(backend));
         context.Properties[typeof(IDrawingBackend)] = backend;
 
-        if (backend is DefaultDrawingBackend defaultBackend)
-        {
-            context.Properties[typeof(IRasterizer)] = defaultBackend.PrimaryRasterizer;
-        }
-
         return context;
     }
 
@@ -39,11 +33,6 @@ internal static void SetDrawingBackend(this Configuration configuration, IDrawin
     {
         Guard.NotNull(backend, nameof(backend));
         configuration.Properties[typeof(IDrawingBackend)] = backend;
-
-        if (backend is DefaultDrawingBackend defaultBackend)
-        {
-            configuration.Properties[typeof(IRasterizer)] = defaultBackend.PrimaryRasterizer;
-        }
     }
 
     /// <summary>
@@ -59,12 +48,6 @@ internal static IDrawingBackend GetDrawingBackend(this IImageProcessingContext c
             return configured;
         }
 
-        if (context.Properties.TryGetValue(typeof(IRasterizer), out object? rasterizer) &&
-            rasterizer is IRasterizer configuredRasterizer)
-        {
-            return DefaultDrawingBackend.Create(configuredRasterizer);
-        }
-
         return context.Configuration.GetDrawingBackend();
     }
 
@@ -81,90 +64,8 @@ internal static IDrawingBackend GetDrawingBackend(this Configuration configurati
             return configured;
         }
 
-        if (configuration.Properties.TryGetValue(typeof(IRasterizer), out object? rasterizer) &&
-            rasterizer is IRasterizer configuredRasterizer)
-        {
-            IDrawingBackend rasterizerBackend = DefaultDrawingBackend.Create(configuredRasterizer);
-            configuration.Properties[typeof(IDrawingBackend)] = rasterizerBackend;
-            return rasterizerBackend;
-        }
-
         IDrawingBackend defaultBackend = DefaultDrawingBackend.Instance;
         configuration.Properties[typeof(IDrawingBackend)] = defaultBackend;
         return defaultBackend;
     }
-
-    /// <summary>
-    /// Sets the rasterizer against the source image processing context.
-    /// </summary>
-    /// <param name="context">The image processing context to store the rasterizer against.</param>
-    /// <param name="rasterizer">The rasterizer to use.</param>
-    /// <returns>The passed in <paramref name="context"/> to allow chaining.</returns>
-    internal static IImageProcessingContext SetRasterizer(this IImageProcessingContext context, IRasterizer rasterizer)
-    {
-        Guard.NotNull(rasterizer, nameof(rasterizer));
-        context.Properties[typeof(IRasterizer)] = rasterizer;
-        context.Properties[typeof(IDrawingBackend)] = DefaultDrawingBackend.Create(rasterizer);
-        return context;
-    }
-
-    /// <summary>
-    /// Sets the default rasterizer against the configuration.
-    /// </summary>
-    /// <param name="configuration">The configuration to store the rasterizer against.</param>
-    /// <param name="rasterizer">The rasterizer to use.</param>
-    internal static void SetRasterizer(this Configuration configuration, IRasterizer rasterizer)
-    {
-        Guard.NotNull(rasterizer, nameof(rasterizer));
-        configuration.Properties[typeof(IRasterizer)] = rasterizer;
-        configuration.Properties[typeof(IDrawingBackend)] = DefaultDrawingBackend.Create(rasterizer);
-    }
-
-    /// <summary>
-    /// Gets the rasterizer from the source image processing context.
-    /// </summary>
-    /// <param name="context">The image processing context to retrieve the rasterizer from.</param>
-    /// <returns>The configured rasterizer.</returns>
-    internal static IRasterizer GetRasterizer(this IImageProcessingContext context)
-    {
-        if (context.Properties.TryGetValue(typeof(IRasterizer), out object? rasterizer) &&
-            rasterizer is IRasterizer configured)
-        {
-            return configured;
-        }
-
-        if (context.Properties.TryGetValue(typeof(IDrawingBackend), out object? backend) &&
-            backend is DefaultDrawingBackend defaultBackend)
-        {
-            return defaultBackend.PrimaryRasterizer;
-        }
-
-        // Do not cache config fallback in the context so changes on configuration reflow.
-        return context.Configuration.GetRasterizer();
-    }
-
-    /// <summary>
-    /// Gets the default rasterizer from the configuration.
-    /// </summary>
-    /// <param name="configuration">The configuration to retrieve the rasterizer from.</param>
-    /// <returns>The configured rasterizer.</returns>
-    internal static IRasterizer GetRasterizer(this Configuration configuration)
-    {
-        if (configuration.Properties.TryGetValue(typeof(IRasterizer), out object? rasterizer) &&
-            rasterizer is IRasterizer configured)
-        {
-            return configured;
-        }
-
-        if (configuration.Properties.TryGetValue(typeof(IDrawingBackend), out object? backend) &&
-            backend is DefaultDrawingBackend defaultBackend)
-        {
-            return defaultBackend.PrimaryRasterizer;
-        }
-
-        IRasterizer defaultRasterizer = DefaultRasterizer.Instance;
-        configuration.Properties[typeof(IRasterizer)] = defaultRasterizer;
-        configuration.Properties[typeof(IDrawingBackend)] = DefaultDrawingBackend.Instance;
-        return defaultRasterizer;
-    }
 }

src/ImageSharp.Drawing/Shapes/Rasterization/DefaultRasterizer.cs

@@ -13,14 +13,16 @@ namespace SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 /// area/cover scanning and chooses an internal execution strategy (parallel row-tiles when
 /// profitable, sequential fallback otherwise).
 /// </remarks>
-internal sealed class DefaultRasterizer : IRasterizer
+internal sealed class DefaultRasterizer
 {
     /// <summary>
     /// Gets the singleton default rasterizer instance.
     /// </summary>
     public static DefaultRasterizer Instance { get; } = new();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Rasterizes the path into scanline coverage.
+    /// </summary>
     public void Rasterize<TState>(
         IPath path,
         in RasterizerOptions options,

src/ImageSharp.Drawing/Shapes/Rasterization/IRasterizer.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+namespace SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
+
+/// <summary>
+/// Delegate invoked for each rasterized scanline.
+/// </summary>
+/// <typeparam name="TState">The caller-provided state type.</typeparam>
+/// <param name="y">The destination y coordinate.</param>
+/// <param name="scanline">Coverage values for the scanline.</param>
+/// <param name="state">Caller-provided mutable state.</param>
+internal delegate void RasterizerScanlineHandler<TState>(int y, Span<float> scanline, ref TState state)
+    where TState : struct;

src/ImageSharp.Drawing/Shapes/Rasterization/RasterizerScanlineHandler{TState}.cs

@@ -13,14 +13,16 @@ namespace SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 /// It is retained as a compact fallback/reference implementation and as an explicit
 /// non-tiled option for profiling and comparison.
 /// </remarks>
-internal sealed class ScanlineRasterizer : IRasterizer
+internal sealed class ScanlineRasterizer
 {
     /// <summary>
     /// Gets the singleton scanline rasterizer instance.
     /// </summary>
     public static ScanlineRasterizer Instance { get; } = new();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Rasterizes the path into scanline coverage using the sequential scanner path.
+    /// </summary>
     public void Rasterize<TState>(
         IPath path,
         in RasterizerOptions options,

src/ImageSharp.Drawing/Shapes/Rasterization/ScanlineRasterizer.cs

@@ -9,7 +9,6 @@
 using Newtonsoft.Json;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Drawing.Processing.Backends;
-using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Drawing.Tests;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -164,42 +163,16 @@ public void Cleanup()
     public void SystemDrawing()
         => this.sdGraphics.DrawPath(this.sdPen, this.sdPath);
 
-    // Keep explicit scanline rasterizer path for side-by-side comparison now that tiled is default.
     [Benchmark]
-    public void ImageSharpCombinedPathsScanlineRasterizer()
-        => this.image.Mutate(c =>
-        {
-            c.SetRasterizer(ScanlineRasterizer.Instance);
-            c.ProcessWithCanvas(canvas => canvas.Draw(this.isPen, this.imageSharpPath));
-        });
-
-    [Benchmark]
-    public void ImageSharpSeparatePathsScanlineRasterizer()
-        => this.image.Mutate(
-            c =>
-            {
-                // Keep explicit scanline rasterizer path for side-by-side comparison now that tiled is default.
-                c.SetRasterizer(ScanlineRasterizer.Instance);
-                c.ProcessWithCanvas(canvas =>
-                {
-                    foreach (PointF[] loop in this.points)
-                    {
-                        canvas.Draw(Processing.Pens.Solid(Color.White, this.Thickness), new Polygon(loop));
-                    }
-                });
-            });
-
-    // Tiled is now the framework default rasterizer path.
-    [Benchmark]
-    public void ImageSharpCombinedPathsTiled()
+    public void ImageSharpCombinedPaths()
         => this.image.Mutate(c => c.ProcessWithCanvas(canvas => canvas.Draw(this.isPen, this.imageSharpPath)));
 
     [Benchmark(Description = "ImageSharp Combined Paths WebGPU Backend")]
     public void ImageSharpCombinedPathsWebGPUBackend()
         => this.webGpuImage.Mutate(c => c.ProcessWithCanvas(canvas => canvas.Draw(this.isPen, this.imageSharpPath)));
 
     [Benchmark]
-    public void ImageSharpSeparatePathsTiled()
+    public void ImageSharpSeparatePaths()
         => this.image.Mutate(
             c => c.ProcessWithCanvas(canvas =>
                 {

tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawPolygon.cs

@@ -8,7 +8,6 @@
 using GeoJSON.Net.Feature;
 using Newtonsoft.Json;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Drawing.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -327,11 +326,7 @@ public void LargeGeoJson_States_All_Benchmark(TestImageProvider<Rgba32> provider
 
         using Image<Rgba32> image = provider.GetImage();
 
-        image.Mutate(c =>
-        {
-            c.SetRasterizer(DefaultRasterizer.Instance);
-            c.ProcessWithCanvas(canvas => canvas.Draw(Pens.Solid(Color.White, thickness), path));
-        });
+        image.Mutate(c => c.ProcessWithCanvas(canvas => canvas.Draw(Pens.Solid(Color.White, thickness), path)));
 
         image.DebugSave(provider, $"Benchmark_{thickness}", appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
     }