Merge pull request #132 from SixLabors/af/simplify-path

Optimize PathGradientBrush, cleanup InternalPath, share ThreadLocal code

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -9,7 +9,6 @@ on:
     pull_request:
         branches:
             - master
-
 jobs:
     Build:
         strategy:
@@ -45,6 +44,20 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            
+            # See https://github.com/actions/checkout/issues/165#issuecomment-657673315
+            - name: Create LFS file list
+              run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
+
+            - name: Restore LFS cache
+              uses: actions/cache@v2
+              id: lfs-cache
+              with:
+                path: .git/lfs
+                key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
+
+            - name: Git LFS Pull
+              run: git lfs pull
 
             - name: Install NuGet
               uses: NuGet/setup-nuget@v1
@@ -68,12 +81,14 @@ jobs:
             - name: Build
               shell: pwsh
               run: ./ci-build.ps1 "${{matrix.options.framework}}"
+              env:
+                SIXLABORS_TESTING: True
 
             - name: Test
               shell: pwsh
               run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
               env:
-                  CI: True
+                  SIXLABORS_TESTING: True
                   XUNIT_PATH: .\tests\ImageSharp.Drawing.Tests # Required for xunit
 
             - name: Export Failed Output
@@ -119,3 +134,4 @@ jobs:
               run: |
                   nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
                   nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
+              # TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org

src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -5,6 +5,7 @@
 using System.Buffers;
 using System.Numerics;
 using System.Threading;
+using SixLabors.ImageSharp.Drawing.Utilities;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -59,7 +60,7 @@ internal abstract class GradientBrushApplicator<TPixel> : BrushApplicator<TPixel
 
             private readonly int scalineWidth;
 
-            private readonly ThreadLocal<ThreadContextData> threadContextData;
+            private readonly ThreadLocalBlenderBuffers<TPixel> blenderBuffers;
 
             private bool isDisposed;
 
@@ -85,9 +86,7 @@ protected GradientBrushApplicator(
                 this.repetitionMode = repetitionMode;
                 this.scalineWidth = target.Width;
                 this.allocator = configuration.MemoryAllocator;
-                this.threadContextData = new ThreadLocal<ThreadContextData>(
-                    () => new ThreadContextData(this.allocator, this.scalineWidth),
-                    true);
+                this.blenderBuffers = new ThreadLocalBlenderBuffers<TPixel>(this.allocator, this.scalineWidth);
             }
 
             internal TPixel this[int x, int y]
@@ -140,9 +139,8 @@ protected GradientBrushApplicator(
             /// <inheritdoc />
             public override void Apply(Span<float> scanline, int x, int y)
             {
-                ThreadContextData contextData = this.threadContextData.Value;
-                Span<float> amounts = contextData.AmountSpan.Slice(0, scanline.Length);
-                Span<TPixel> overlays = contextData.OverlaySpan.Slice(0, scanline.Length);
+                Span<float> amounts = this.blenderBuffers.AmountSpan.Slice(0, scanline.Length);
+                Span<TPixel> overlays = this.blenderBuffers.OverlaySpan.Slice(0, scanline.Length);
                 float blendPercentage = this.Options.BlendPercentage;
 
                 // TODO: Remove bounds checks.
@@ -193,12 +191,7 @@ protected override void Dispose(bool disposing)
 
                 if (disposing)
                 {
-                    foreach (ThreadContextData data in this.threadContextData.Values)
-                    {
-                        data.Dispose();
-                    }
-
-                    this.threadContextData.Dispose();
+                    this.blenderBuffers.Dispose();
                 }
 
                 this.isDisposed = true;
@@ -225,33 +218,6 @@ protected override void Dispose(bool disposing)
 
                 return (localGradientFrom, localGradientTo);
             }
-
-            private sealed class ThreadContextData : IDisposable
-            {
-                private bool isDisposed;
-                private readonly IMemoryOwner<float> amountBuffer;
-                private readonly IMemoryOwner<TPixel> overlayBuffer;
-
-                public ThreadContextData(MemoryAllocator allocator, int scanlineLength)
-                {
-                    this.amountBuffer = allocator.Allocate<float>(scanlineLength);
-                    this.overlayBuffer = allocator.Allocate<TPixel>(scanlineLength);
-                }
-
-                public Span<float> AmountSpan => this.amountBuffer.Memory.Span;
-
-                public Span<TPixel> OverlaySpan => this.overlayBuffer.Memory.Span;
-
-                public void Dispose()
-                {
-                    if (!this.isDisposed)
-                    {
-                        this.isDisposed = true;
-                        this.amountBuffer.Dispose();
-                        this.overlayBuffer.Dispose();
-                    }
-                }
-            }
         }
     }
 }