From 79016bcc4aba54e7fe0b3edf9b5505ae504ca001 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Fri, 1 Jan 2021 15:31:04 +0100
Subject: [PATCH] gpu: close outline paths if not already closed

The new compute renderer is much less tolerant of discontinuous paths.
In particular, it requires that clip outlines form a closed loop.

Fixes TestPaintArc when GIORENDERER=forcecompute.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 gpu/gpu.go | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/gpu/gpu.go b/gpu/gpu.go
index 98b568ec..eaa000f5 100644
--- a/gpu/gpu.go
+++ b/gpu/gpu.go
@@ -1342,7 +1342,7 @@ func (d *drawOps) buildVerts(aux []byte, tr f32.Affine2D, outline bool, stroke c
 	case stroke.Width > 0:
 		// Stroke path.
 		quads := make(strokeQuads, 0, 2*len(aux)/(ops.QuadSize+4))
-		for qi := 0; len(aux) >= (ops.QuadSize + 4); qi++ {
+		for len(aux) >= ops.QuadSize+4 {
 			quad := strokeQuad{
 				contour: bo.Uint32(aux),
 				quad:    ops.DecodeQuad(aux[4:]),
@@ -1360,15 +1360,37 @@ func (d *drawOps) buildVerts(aux []byte, tr f32.Affine2D, outline bool, stroke c
 
 	case outline:
 		// Outline path.
-		for qi := 0; len(aux) >= (ops.QuadSize + 4); qi++ {
+		first := true
+		var firstPt, lastPt f32.Point
+		for len(aux) >= ops.QuadSize+4 {
 			d.qs.contour = bo.Uint32(aux)
 			quad := ops.DecodeQuad(aux[4:])
 			quad = quad.Transform(tr)
 
+			if first {
+				first = false
+				firstPt = quad.From
+				lastPt = quad.From
+			}
+			if quad.From != lastPt {
+				if lastPt != firstPt {
+					// Close outline before starting a new.
+					mid := firstPt.Add(lastPt).Mul(.5)
+					d.qs.splitAndEncode(ops.Quad{From: lastPt, To: firstPt, Ctrl: mid})
+				}
+				firstPt = quad.From
+			}
+			lastPt = quad.To
+
 			d.qs.splitAndEncode(quad)
 
 			aux = aux[ops.QuadSize+4:]
 		}
+		// Close last outline if necessary.
+		if !first && lastPt != firstPt {
+			mid := firstPt.Add(lastPt).Mul(.5)
+			d.qs.splitAndEncode(ops.Quad{From: lastPt, To: firstPt, Ctrl: mid})
+		}
 	}
 
 	fillMaxY(d.vertCache[startLength:])