diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index cc158eb..72c0160 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -1158,7 +1158,7 @@ proc maxEntryCount(partitioning: var Partitioning): int =
proc fixed32(f: float32): Fixed32 {.inline.} =
Fixed32(f * 256)
-proc integer(p: Fixed32): int {.inline.} =
+proc integer(p: Fixed32): int32 {.inline.} =
p div 256
proc trunc(p: Fixed32): Fixed32 {.inline.} =
@@ -1223,6 +1223,20 @@ iterator walk(
if prevAt != width.float32.fixed32 and count != 0:
echo "Leak detected: ", count, " @ (", prevAt, ", ", y, ")"
+iterator walkInteger(
+ hits: seq[(int32, int16)],
+ numHits: int,
+ windingRule: WindingRule,
+ y, width: int
+): (int32, int32) =
+ for (prevAt, at, count) in hits.walk(numHits, windingRule, y, width):
+ let
+ fillStart = prevAt.integer
+ fillLen = at.integer - fillStart
+ if fillLen <= 0:
+ continue
+ yield (fillStart, fillLen)
+
proc computeCoverage(
coverages: ptr UncheckedArray[uint8],
hits: var seq[(Fixed32, int16)],
@@ -1481,22 +1495,6 @@ proc fillCoverage(
mask.clearUnsafe(0, y, startX, y)
mask.clearUnsafe(startX + coverages.len, y, mask.width, y)
-template walkHits(
- hits: seq[(int32, int16)],
- numHits: int,
- windingRule: WindingRule,
- y, width: int,
- inner: untyped
-) =
- for (prevAt, at, count) in hits.walk(numHits, windingRule, y, width):
- let
- fillStart {.inject.} = prevAt.integer
- fillLen {.inject.} = at.integer - fillStart
- if fillLen <= 0:
- continue
-
- inner
-
proc fillHits(
image: Image,
rgbx: ColorRGBX,
@@ -1506,36 +1504,36 @@ proc fillHits(
windingRule: WindingRule,
blendMode: BlendMode
) =
- template simdBlob(image: Image, x: var int, blendProc: untyped) =
+ template simdBlob(image: Image, x: var int, len: int32, blendProc: untyped) =
when allowSimd:
when defined(amd64):
let colorVec = mm_set1_epi32(cast[int32](rgbx))
- for _ in 0 ..< fillLen div 4:
+ for _ in 0 ..< len div 4:
let backdrop = mm_loadu_si128(image.unsafe[x, y].addr)
mm_storeu_si128(image.unsafe[x, y].addr, blendProc(backdrop, colorVec))
x += 4
case blendMode:
of OverwriteBlend:
- walkHits hits, numHits, windingRule, y, image.width:
- fillUnsafe(image.data, rgbx, image.dataIndex(fillStart, y), fillLen)
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width):
+ fillUnsafe(image.data, rgbx, image.dataIndex(start, y), len)
of NormalBlend:
- walkHits hits, numHits, windingRule, y, image.width:
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width):
if rgbx.a == 255:
- fillUnsafe(image.data, rgbx, image.dataIndex(fillStart, y), fillLen)
+ fillUnsafe(image.data, rgbx, image.dataIndex(start, y), len)
else:
- var x = fillStart
- simdBlob(image, x, blendNormalSimd)
- for x in x ..< fillStart + fillLen:
+ var x = start
+ simdBlob(image, x, len, blendNormalSimd)
+ for x in x ..< start + len:
let backdrop = image.unsafe[x, y]
image.unsafe[x, y] = blendNormal(backdrop, rgbx)
of MaskBlend:
var filledTo = startX
- walkHits hits, numHits, windingRule, y, image.width:
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width):
block: # Clear any gap between this fill and the previous fill
- let gapBetween = fillStart - filledTo
+ let gapBetween = start - filledTo
if gapBetween > 0:
fillUnsafe(
image.data,
@@ -1543,12 +1541,12 @@ proc fillHits(
image.dataIndex(filledTo, y),
gapBetween
)
- filledTo = fillStart + fillLen
+ filledTo = start + len
block: # Handle this fill
if rgbx.a != 255:
- var x = fillStart
- simdBlob(image, x, blendMaskSimd)
- for x in x ..< fillStart + fillLen:
+ var x = start
+ simdBlob(image, x, len, blendMaskSimd)
+ for x in x ..< start + len:
let backdrop = image.unsafe[x, y]
image.unsafe[x, y] = blendMask(backdrop, rgbx)
@@ -1557,8 +1555,8 @@ proc fillHits(
else:
let blender = blendMode.blender()
- walkHits hits, numHits, windingRule, y, image.width:
- for x in fillStart ..< fillStart + fillLen:
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width):
+ for x in start ..< start + len:
let backdrop = image.unsafe[x, y]
image.unsafe[x, y] = blender(backdrop, rgbx)
@@ -1570,44 +1568,44 @@ proc fillHits(
windingRule: WindingRule,
blendMode: BlendMode
) =
- template simdBlob(mask: Mask, x: var int, blendProc: untyped) =
+ template simdBlob(mask: Mask, x: var int, len: int32, blendProc: untyped) =
when allowSimd:
when defined(amd64):
let vec255 = mm_set1_epi8(255)
- for _ in 0 ..< fillLen div 16:
+ for _ in 0 ..< len div 16:
let backdrop = mm_loadu_si128(mask.unsafe[x, y].addr)
mm_storeu_si128(mask.unsafe[x, y].addr, blendProc(backdrop, vec255))
x += 16
case blendMode:
of NormalBlend, OverwriteBlend:
- walkHits hits, numHits, windingRule, y, mask.width:
- fillUnsafe(mask.data, 255, mask.dataIndex(fillStart, y), fillLen)
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, mask.width):
+ fillUnsafe(mask.data, 255, mask.dataIndex(start, y), len)
of MaskBlend:
var filledTo = startX
- walkHits hits, numHits, windingRule,y, mask.width:
- let gapBetween = fillStart - filledTo
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, mask.width):
+ let gapBetween = start - filledTo
if gapBetween > 0:
fillUnsafe(mask.data, 0, mask.dataIndex(filledTo, y), gapBetween)
- filledTo = fillStart + fillLen
+ filledTo = start + len
mask.clearUnsafe(0, y, startX, y)
mask.clearUnsafe(filledTo, y, mask.width, y)
of SubtractMaskBlend:
- walkHits hits, numHits, windingRule, y, mask.width:
- var x = fillStart
- simdBlob(mask, x, maskBlendSubtractSimd)
- for x in x ..< fillStart + fillLen:
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, mask.width):
+ var x = start
+ simdBlob(mask, x, len, maskBlendSubtractSimd)
+ for x in x ..< start + len:
let backdrop = mask.unsafe[x, y]
mask.unsafe[x, y] = maskBlendSubtract(backdrop, 255)
of ExcludeMaskBlend:
- walkHits hits, numHits, windingRule, y, mask.width:
- var x = fillStart
- simdBlob(mask, x, maskBlendExcludeSimd)
- for x in x ..< fillStart + fillLen:
+ for (start, len) in hits.walkInteger(numHits, windingRule, y, mask.width):
+ var x = start
+ simdBlob(mask, x, len, maskBlendExcludeSimd)
+ for x in x ..< start + len:
let backdrop = mask.unsafe[x, y]
mask.unsafe[x, y] = maskBlendExclude(backdrop, 255)