Strip out blaze so we can port back improvements.

Author: JimBobSquarePants

ImageSharp.Drawing.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11123.170 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
@@ -337,10 +337,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpBlaze", "..\SharpBlaze\SharpBlaze\SharpBlaze.csproj", "{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpBlaze.Numerics", "..\SharpBlaze\SharpBlaze.Numerics\SharpBlaze.Numerics.csproj", "{5490DFAF-0891-535F-08B4-2BF03C2BB778}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -371,18 +367,6 @@ Global
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.DebugFast|Any CPU.Build.0 = Debug|Any CPU
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCEDD229-22BC-4B82-87DE-786BBFC52EDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.DebugFast|Any CPU.ActiveCfg = DebugFast|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.DebugFast|Any CPU.Build.0 = DebugFast|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5490DFAF-0891-535F-08B4-2BF03C2BB778}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -4,65 +4,44 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Numerics;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using BenchmarkDotNet.Attributes;
 using GeoJSON.Net.Feature;
 using Newtonsoft.Json;
-using SharpBlaze;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Drawing.Shapes.PolygonClipper;
 using SixLabors.ImageSharp.Drawing.Tests;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SkiaSharp;
-using BlazeMatrix = SharpBlaze.Matrix;
 using Pen = System.Drawing.Pen;
 using SDPointF = System.Drawing.PointF;
 
 namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing;
 
 public abstract class DrawPolygon
 {
-    private string artifactDir;
-
     private PointF[][] points;
 
     private Image<Rgba32> image;
-    private bool savedImageSharp;
 
     private SDPointF[][] sdPoints;
     private Bitmap sdBitmap;
     private Graphics sdGraphics;
-    private bool savedSd;
 
     private SKPath skPath;
     private SKSurface skSurface;
-    private bool savedSkia;
-
-    private Executor executor;
-    private DestinationImage<TileDescriptor_8x16> vecDst;
-    private bool savedBlaze;
 
     protected abstract int Width { get; }
 
     protected abstract int Height { get; }
 
     protected abstract float Thickness { get; }
 
-    protected abstract string BenchName { get; }
-
     protected virtual PointF[][] GetPoints(FeatureCollection features) =>
         features.Features.SelectMany(f => PolygonFactory.GetGeoJsonPoints(f, Matrix3x2.CreateScale(60, 60))).ToArray();
 
-    private string GetArtifactPath(string name) => System.IO.Path.Combine(this.artifactDir, name);
-
     [GlobalSetup]
     public void Setup()
     {
-        this.artifactDir = TestEnvironment.GetFullPath($"artifacts\\{BenchName}");
-        Directory.CreateDirectory(this.artifactDir);
-
         string jsonContent = File.ReadAllText(TestFile.GetInputFileFullPath(TestImages.GeoJson.States));
 
         FeatureCollection featureCollection = JsonConvert.DeserializeObject<FeatureCollection>(jsonContent);
@@ -71,11 +50,9 @@ public void Setup()
         this.sdPoints = this.points.Select(pts => pts.Select(p => new SDPointF(p.X, p.Y)).ToArray()).ToArray();
 
         this.skPath = new SKPath();
-
         foreach (PointF[] ptArr in this.points.Where(pts => pts.Length > 2))
         {
             this.skPath.MoveTo(ptArr[0].X, ptArr[1].Y);
-
             for (int i = 1; i < ptArr.Length; i++)
             {
                 this.skPath.LineTo(ptArr[i].X, ptArr[i].Y);
@@ -84,11 +61,6 @@ public void Setup()
             this.skPath.LineTo(ptArr[0].X, ptArr[1].Y);
         }
 
-        this.executor = new SerialExecutor();
-        this.vecDst = new DestinationImage<TileDescriptor_8x16>();
-        this.vecDst.UpdateSize(new IntSize(this.Width, this.Height));
-        this.vecDst.ClearImage();
-
         this.image = new Image<Rgba32>(this.Width, this.Height);
         this.sdBitmap = new Bitmap(this.Width, this.Height);
         this.sdGraphics = Graphics.FromImage(this.sdBitmap);
@@ -107,7 +79,6 @@ public void Cleanup()
         this.skPath.Dispose();
     }
 
-    [SupportedOSPlatform("windows")]
     [Benchmark]
     public void SystemDrawing()
     {
@@ -117,18 +88,11 @@ public void SystemDrawing()
         {
             this.sdGraphics.DrawPolygon(pen, loop);
         }
-
-        if (!this.savedSd)
-        {
-            this.sdBitmap.Save(this.GetArtifactPath("SystemDrawing.png"));
-            this.savedSd = true;
-        }
     }
 
     [Benchmark]
     public void ImageSharp()
-    {
-        this.image.Mutate(
+        => this.image.Mutate(
             c =>
             {
                 foreach (PointF[] loop in this.points)
@@ -137,13 +101,6 @@ public void ImageSharp()
                 }
             });
 
-        if (!this.savedImageSharp)
-        {
-            this.image.SaveAsPng(this.GetArtifactPath("ImageSharp.png"));
-            this.savedImageSharp = true;
-        }
-    }
-
     [Benchmark(Baseline = true)]
     public void SkiaSharp()
     {
@@ -156,134 +113,6 @@ public void SkiaSharp()
         };
 
         this.skSurface.Canvas.DrawPath(this.skPath, paint);
-
-        if (!this.savedSkia)
-        {
-            using var skSnapshot = this.skSurface.Snapshot();
-            using var skEncoded = skSnapshot.Encode();
-            using var skFile = new FileStream(this.GetArtifactPath("SkiaSharp.png"), FileMode.Create);
-            skEncoded.SaveTo(skFile);
-            this.savedSkia = true;
-        }
-    }
-
-    [Benchmark]
-    public unsafe void Blaze()
-    {
-        VectorImageBuilder builder = new();
-
-        foreach (PointF[] loop in this.points)
-        {
-            var loopPolygon = new Polygon(loop);
-            var brush = new Processing.SolidBrush(Color.White);
-            var pen = new SolidPen(brush, this.Thickness);
-            List<List<PointF>> outline = GenerateOutlineList(loopPolygon, pen.StrokeWidth, pen.JointStyle, pen.EndCapStyle);
-
-            foreach (List<PointF> line in outline)
-            {
-                Span<PointF> ptArr = CollectionsMarshal.AsSpan(line);
-
-                builder.MoveTo(new FloatPoint(ptArr[0].X, ptArr[1].Y));
-                for (int i = 1; i < ptArr.Length; i++)
-                {
-                    builder.LineTo(new FloatPoint(ptArr[i].X, ptArr[i].Y));
-                }
-
-                builder.LineTo(new FloatPoint(ptArr[0].X, ptArr[1].Y));
-
-                builder.Close();
-            }
-        }
-
-        VectorImage image = builder.ToVectorImage(Color.White.ToPixel<Rgba32>().PackedValue);
-
-        this.vecDst.DrawImage(image, BlazeMatrix.Identity, this.executor);
-
-        if (!this.savedBlaze)
-        {
-            using var blazeImage = Image.WrapMemory<Rgba32>(
-                this.vecDst.GetImageData(),
-                this.vecDst.GetBytesPerRow() * this.vecDst.GetImageHeight(),
-                this.vecDst.GetImageWidth(),
-                this.vecDst.GetImageHeight());
-
-            blazeImage.SaveAsPng(this.GetArtifactPath("Blaze.png"));
-            this.savedBlaze = true;
-        }
-    }
-
-    public static List<List<PointF>> GenerateOutlineList(IPath path, float width, JointStyle jointStyle, EndCapStyle endCapStyle)
-    {
-        List<List<PointF>> strokedLines = [];
-
-        if (width <= 0)
-        {
-            return strokedLines;
-        }
-
-        PolygonStroker stroker = new()
-        {
-            Width = width,
-            LineJoin = GetLineJoin(jointStyle),
-            LineCap = GetLineCap(endCapStyle)
-        };
-        foreach (ISimplePath simplePath in path.Flatten())
-        {
-            stroker.Reset();
-
-            int pointCount = 0;
-            if (simplePath is Path concretePath)
-            {
-                foreach (ILineSegment line in concretePath.LineSegments)
-                {
-                    if (line is CubicBezierLineSegment bezier)
-                    {
-                        // TODO: add bezier control points
-                        ReadOnlySpan<PointF> points = line.Flatten().Span;
-                        stroker.AddLinePath(points);
-                        pointCount += points.Length;
-                    }
-                    else
-                    {
-                        ReadOnlySpan<PointF> points = line.Flatten().Span;
-                        stroker.AddLinePath(points);
-                        pointCount += points.Length;
-                    }
-                }
-            }
-            else
-            {
-                ReadOnlySpan<PointF> points = simplePath.Points.Span;
-                stroker.AddLinePath(points);
-                pointCount = points.Length;
-            }
-
-            bool isClosed = simplePath.IsClosed || endCapStyle is EndCapStyle.Polygon or EndCapStyle.Joined;
-            if (isClosed)
-            {
-                stroker.ClosePath();
-            }
-
-            List<PointF> lineBuilder = new(pointCount * 4);
-            stroker.FinishPath(lineBuilder);
-            strokedLines.Add(lineBuilder);
-        }
-
-        return strokedLines;
-
-        static LineJoin GetLineJoin(JointStyle value) => value switch
-        {
-            JointStyle.Square => LineJoin.BevelJoin,
-            JointStyle.Round => LineJoin.RoundJoin,
-            _ => LineJoin.MiterJoin,
-        };
-
-        static LineCap GetLineCap(EndCapStyle value) => value switch
-        {
-            EndCapStyle.Round => LineCap.Round,
-            EndCapStyle.Square => LineCap.Square,
-            _ => LineCap.Butt,
-        };
     }
 }
 
@@ -294,8 +123,6 @@ public class DrawPolygonAll : DrawPolygon
     protected override int Height => 4800;
 
     protected override float Thickness => 2f;
-
-    protected override string BenchName => nameof(DrawPolygonAll);
 }
 
 public class DrawPolygonMediumThin : DrawPolygon
@@ -306,8 +133,6 @@ public class DrawPolygonMediumThin : DrawPolygon
 
     protected override float Thickness => 1f;
 
-    protected override string BenchName => nameof(DrawPolygonMediumThin);
-
     protected override PointF[][] GetPoints(FeatureCollection features)
     {
         Feature state = features.Features.Single(f => (string)f.Properties["NAME"] == "Mississippi");
@@ -321,6 +146,4 @@ protected override PointF[][] GetPoints(FeatureCollection features)
 public class DrawPolygonMediumThick : DrawPolygonMediumThin
 {
     protected override float Thickness => 10f;
-
-    protected override string BenchName => nameof(DrawPolygonMediumThick);
 }