From 1797914ac8205a890e6bfb50574744cb7b0c8b83 Mon Sep 17 00:00:00 2001
From: Raph Levien <raph.levien@gmail.com>
Date: Sat, 2 May 2020 16:20:04 -0700
Subject: [PATCH] Fix artifacts

We were overwriting `end` when clipping, then reusing it when reading
the path, for continuity.
---
 piet-gpu/shader/kernel2f.comp |   8 +++++---
 piet-gpu/shader/kernel2f.spv  | Bin 21048 -> 21108 bytes
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/piet-gpu/shader/kernel2f.comp b/piet-gpu/shader/kernel2f.comp
index 14a6ead..7ea93bd 100644
--- a/piet-gpu/shader/kernel2f.comp
+++ b/piet-gpu/shader/kernel2f.comp
@@ -119,6 +119,8 @@ void main() {
                     && ytop < ybot
                     && s00 * s01 + s00 * s10 + s00 * s11 < 3.0)
                 {
+                    // avoid overwriting `end` so that it can be used as start
+                    vec2 enc_end = end;
                     if (xymin.x < xy0.x) {
                         float yEdge = mix(start.y, end.y, (start.x - xy0.x) / b);
                         if (yEdge >= xy0.y && yEdge < xy1.y) {
@@ -127,8 +129,8 @@ void main() {
                             // in piet-metal).
                             FillSegment edge_seg;
                             if (b > 0.0) {
-                                end = vec2(xy0.x, yEdge);
-                                edge_seg.start = end;
+                                enc_end = vec2(xy0.x, yEdge);
+                                edge_seg.start = enc_end;
                                 edge_seg.end = vec2(xy0.x, xy1.y);
                             } else {
                                 start = vec2(xy0.x, yEdge);
@@ -141,7 +143,7 @@ void main() {
                         }
                     }
                     alloc_chunk(chunk_n_segs, seg_chunk_ref, first_seg_chunk, seg_limit);
-                    FillSegment seg = FillSegment(start, end);
+                    FillSegment seg = FillSegment(start, enc_end);
                     FillSegment_write(FillSegmentRef(seg_chunk_ref.offset + FillSegChunk_size + FillSegment_size * chunk_n_segs), seg);
                     chunk_n_segs++;
                 }
diff --git a/piet-gpu/shader/kernel2f.spv b/piet-gpu/shader/kernel2f.spv
index 36e7b9475cc5d71b962abffe64ffda55eb72107c..75a7a39616532d313668ff49c7fbd7b0ec2b8681 100644
GIT binary patch
delta 3642
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

delta 3560
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
LENri7THf<NicY#j