Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/pixie/paths.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@ proc fillShapes(
# rasterize only within the total bounds
let
rgbx = color.asRgbx()
clearsUncovered = blendMode == MaskBlend
segments = shapes.shapesToSegments()
bounds = computeBounds(segments).snapToPixels()
startX = max(0, bounds.x.int)
Expand Down Expand Up @@ -1806,7 +1807,8 @@ proc fillShapes(
applyOpacity(vecRgbx, area)
else:
rgbx * area
image.data[dataIndex] = blender(backdrop, source)
if source.a != 0 or clearsUncovered:
image.data[dataIndex] = blender(backdrop, source)

block: # Right-side partial coverage
let
Expand Down Expand Up @@ -1844,7 +1846,8 @@ proc fillShapes(
applyOpacity(vecRgbx, area)
else:
rgbx * area
image.data[dataIndex] = blender(backdrop, source)
if source.a != 0 or clearsUncovered:
image.data[dataIndex] = blender(backdrop, source)

let
fillBegin = leftCoverEnd.clamp(0, image.width)
Expand Down
14 changes: 13 additions & 1 deletion src/pixie/simd/avx2.nim
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,19 @@ proc blendLineCoverageOverwriteAvx2*(
mm_srli_si128(coverageHi, 8),
]
for j in 0 ..< 4:
mm256_store_si256(line[i].addr, rgbxVec.applyCoverage(coverages[j]))
let
preserve = mm256_cmpeq_epi32(
mm256_cvtepu8_epi32(coverages[j]), vecZero
)
source = rgbxVec.applyCoverage(coverages[j])
backdrop = mm256_load_si256(line[i].addr)
mm256_store_si256(
line[i].addr,
mm256_or_si256(
mm256_and_si256(preserve, backdrop),
mm256_andnot_si256(preserve, source)
)
)
i += 8

for i in i ..< len:
Expand Down
17 changes: 13 additions & 4 deletions src/pixie/simd/neon.nim
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,20 @@ proc blendLineCoverageOverwriteNeon*(
elif mask255 == uint64.high:
vst4q_u8(line[i].addr, vecRgbx)
else:
let backdrop = vld4q_u8(line[i].addr)
var source: uint8x16x4
source.val[0] = multiplyDiv255(vecRgbx.val[0], coverage)
source.val[1] = multiplyDiv255(vecRgbx.val[1], coverage)
source.val[2] = multiplyDiv255(vecRgbx.val[2], coverage)
source.val[3] = multiplyDiv255(vecRgbx.val[3], coverage)
source.val[0] = vbslq_u8(
eqZero, backdrop.val[0], multiplyDiv255(vecRgbx.val[0], coverage)
)
source.val[1] = vbslq_u8(
eqZero, backdrop.val[1], multiplyDiv255(vecRgbx.val[1], coverage)
)
source.val[2] = vbslq_u8(
eqZero, backdrop.val[2], multiplyDiv255(vecRgbx.val[2], coverage)
)
source.val[3] = vbslq_u8(
eqZero, backdrop.val[3], multiplyDiv255(vecRgbx.val[3], coverage)
)
vst4q_u8(line[i].addr, source)

i += 16
Expand Down
18 changes: 16 additions & 2 deletions src/pixie/simd/sse2.nim
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,24 @@ proc blendLineCoverageOverwriteSse2*(
mm_store_si128(line[i].addr, rgbxVec)
i += 4
else:
var coverage = coverage
var
coverage = coverage
eqZero = eqZero
for _ in 0 ..< 4:
mm_store_si128(line[i].addr, rgbxVec.applyCoverage(coverage))
var preserve = mm_unpacklo_epi8(eqZero, eqZero)
preserve = mm_unpacklo_epi16(preserve, preserve)
let
source = rgbxVec.applyCoverage(coverage)
backdrop = mm_load_si128(line[i].addr)
mm_store_si128(
line[i].addr,
mm_or_si128(
mm_and_si128(preserve, backdrop),
mm_andnot_si128(preserve, source)
)
)
coverage = mm_srli_si128(coverage, 4)
eqZero = mm_srli_si128(eqZero, 4)
i += 4

for i in i ..< len:
Expand Down
Binary file added tests/paths/overwriteCircle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/paths/overwriteStar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 38 additions & 1 deletion tests/test_paths.nim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import chroma, pixie, pixie/fileformats/png, strformat, xrays
import chroma, pixie, std/math, pixie/fileformats/png, strformat, xrays

block:
let pathStr = """
Expand Down Expand Up @@ -760,3 +760,40 @@ block:
"""
let path = parsePath(pathStr)
doAssert path.computeBounds() == rect(0, 0, 0, 100)

block:
# OverwriteBlend must leave pixels the path does not cover, so on an opaque
# backdrop nothing can end up fully transparent.
let
image = newImage(128, 64)
paint = newPaint(SolidPaint)
path = newPath()
image.fill(rgbx(0, 0, 255, 255))
paint.color = color(1, 0, 0, 1)
paint.blendMode = OverwriteBlend
path.circle(circle(vec2(64, 32), 40))
image.fillPath(path, paint)
for c in image.data:
doAssert c.a != 0
image.xray("tests/paths/overwriteCircle.png")

block:
# Spikes thin enough that coverage rounds to nothing near their tips.
let
image = newImage(260, 200)
paint = newPaint(SolidPaint)
path = newPath()
image.fill(rgbx(0, 0, 255, 255))
paint.color = color(1, 0.85, 0.1, 1)
paint.blendMode = OverwriteBlend
for i in 0 ..< 80:
let
a = i.float32 * PI.float32 / 40
r = if (i and 1) == 0: 42.0 else: 92.0
pt = vec2(130 + cos(a) * r, 100 + sin(a) * r)
if i == 0: path.moveTo(pt) else: path.lineTo(pt)
path.closePath()
image.fillPath(path, paint)
for c in image.data:
doAssert c.a != 0
image.xray("tests/paths/overwriteStar.png")