op/paint,app/internal/gpu: post-process paths during GPU upload

Signed-off-by: Elias Naur <mail@eliasnaur.com>

app/internal/gpu/gpu.go

@@ -11,11 +11,13 @@ import (
 	"runtime"
 	"strings"
 	"time"
+	"unsafe"
 
 	"gioui.org/app/internal/gl"
 	"gioui.org/f32"
 	"gioui.org/internal/opconst"
 	"gioui.org/internal/ops"
+	"gioui.org/internal/path"
 	"gioui.org/op"
 	"gioui.org/op/paint"
 )
@@ -698,6 +700,14 @@ loop:
 			state.t = state.t.Multiply(op.TransformOp(dop))
 		case opconst.TypeAux:
 			aux = encOp.Data[opconst.TypeAuxLen:]
+			// The first data byte stores whether the MaxY
+			// fields have been initialized.
+			maxyFilled := aux[0] == 1
+			aux[0] = 1
+			aux = aux[1:]
+			if !maxyFilled {
+				fillMaxY(aux)
+			}
 			auxKey = encOp.Key
 		case opconst.TypeClip:
 			var op clipOp
@@ -987,6 +997,47 @@ func createTexture(ctx *context) gl.Texture {
 	return tex
 }
 
+// Fill in maximal Y coordinates of the NW and NE corners.
+func fillMaxY(verts []byte) {
+	contour := 0
+	bo := binary.LittleEndian
+	for len(verts) > 0 {
+		maxy := float32(math.Inf(-1))
+		i := 0
+		for ; i+path.VertStride*4 <= len(verts); i += path.VertStride * 4 {
+			vert := verts[i : i+path.VertStride]
+			// MaxY contains the integer contour index.
+			pathContour := int(bo.Uint32(vert[int(unsafe.Offsetof(((*path.Vertex)(nil)).MaxY)):]))
+			if contour != pathContour {
+				contour = pathContour
+				break
+			}
+			fromy := math.Float32frombits(bo.Uint32(vert[int(unsafe.Offsetof(((*path.Vertex)(nil)).FromY)):]))
+			ctrly := math.Float32frombits(bo.Uint32(vert[int(unsafe.Offsetof(((*path.Vertex)(nil)).CtrlY)):]))
+			toy := math.Float32frombits(bo.Uint32(vert[int(unsafe.Offsetof(((*path.Vertex)(nil)).ToY)):]))
+			if fromy > maxy {
+				maxy = fromy
+			}
+			if ctrly > maxy {
+				maxy = ctrly
+			}
+			if toy > maxy {
+				maxy = toy
+			}
+		}
+		fillContourMaxY(maxy, verts[:i])
+		verts = verts[i:]
+	}
+}
+
+func fillContourMaxY(maxy float32, verts []byte) {
+	bo := binary.LittleEndian
+	for i := 0; i < len(verts); i += path.VertStride {
+		off := int(unsafe.Offsetof(((*path.Vertex)(nil)).MaxY))
+		bo.PutUint32(verts[i+off:], math.Float32bits(maxy))
+	}
+}
+
 const blitVSrc = `
 #version 100
 

op/op.go

@@ -166,11 +166,6 @@ func (o *Ops) Refs() []interface{} {
 	return o.refs
 }
 
-// PC is for internal use only.
-func (o *Ops) PC() int {
-	return o.pc().data
-}
-
 // Version is for internal use only.
 func (o *Ops) Version() int {
 	return o.version

op/paint/path.go

@@ -5,7 +5,6 @@ package paint
 import (
 	"encoding/binary"
 	"math"
-	"unsafe"
 
 	"gioui.org/f32"
 	"gioui.org/internal/opconst"
@@ -19,10 +18,7 @@ import (
 // supplied to Begin.
 type Path struct {
 	ops       *op.Ops
-	pc        int
+	contour   int
-	firstVert int
-	nverts    int
-	maxy      float32
 	pen       f32.Point
 	bounds    f32.Rectangle
 	hasBounds bool
@@ -51,28 +47,22 @@ func (p ClipOp) Add(o *op.Ops) {
 func (p *Path) Begin(ops *op.Ops) {
 	p.ops = ops
 	p.macro.Record(ops)
-	ops.Write([]byte{byte(opconst.TypeAux)})
+	// Write the TypeAux opcode and a byte for marking whether the
-	p.pc = ops.PC()
+	// path has had its MaxY filled out. If not, the gpu will fill it
+	// before using it.
+	ops.Write([]byte{byte(opconst.TypeAux), 0})
 }
 
 // MoveTo moves the pen to the given position.
 func (p *Path) Move(to f32.Point) {
 	p.end()
 	to = to.Add(p.pen)
-	p.maxy = to.Y
 	p.pen = to
 }
 
 // end completes the current contour.
 func (p *Path) end() {
-	aux := p.ops.Data()[p.pc:]
+	p.contour++
-	bo := binary.LittleEndian
-	// Fill in maximal Y coordinates of the NW and NE corners.
-	for i := p.firstVert; i < p.nverts; i++ {
-		off := path.VertStride*i + int(unsafe.Offsetof(((*path.Vertex)(nil)).MaxY))
-		bo.PutUint32(aux[off:], math.Float32bits(p.maxy))
-	}
-	p.firstVert = p.nverts
 }
 
 // Line records a line from the pen to end.
@@ -238,7 +228,6 @@ func (p *Path) expand(b f32.Rectangle) {
 }
 
 func (p *Path) vertex(cornerx, cornery int16, ctrl, to f32.Point) {
-	p.nverts++
 	v := path.Vertex{
 		CornerX: cornerx,
 		CornerY: cornery,
@@ -255,7 +244,8 @@ func (p *Path) vertex(cornerx, cornery int16, ctrl, to f32.Point) {
 	data[1] = byte(uint16(v.CornerX) >> 8)
 	data[2] = byte(uint16(v.CornerY))
 	data[3] = byte(uint16(v.CornerY) >> 8)
-	bo.PutUint32(data[6:], math.Float32bits(v.MaxY))
+	// Put the contour index in MaxY.
+	bo.PutUint32(data[4:], uint32(p.contour))
 	bo.PutUint32(data[8:], math.Float32bits(v.FromX))
 	bo.PutUint32(data[12:], math.Float32bits(v.FromY))
 	bo.PutUint32(data[16:], math.Float32bits(v.CtrlX))
@@ -266,15 +256,6 @@ func (p *Path) vertex(cornerx, cornery int16, ctrl, to f32.Point) {
 }
 
 func (p *Path) simpleQuadTo(ctrl, to f32.Point) {
-	if p.pen.Y > p.maxy {
-		p.maxy = p.pen.Y
-	}
-	if ctrl.Y > p.maxy {
-		p.maxy = ctrl.Y
-	}
-	if to.Y > p.maxy {
-		p.maxy = to.Y
-	}
 	// NW.
 	p.vertex(-1, 1, ctrl, to)
 	// NE.