MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #111 from guzba/master

Browse source 
small improvements
This commit is contained in:
treeform 2021-02-17 21:29:50 -08:00 committed by GitHub
commit 8241b23de7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/pixie/paths.nim
View file

@ -897,7 +897,6 @@ proc partitionSegments(
template computeCoverages( template computeCoverages(
coverages: var seq[uint8], coverages: var seq[uint8],
hits: var seq[(float32, int16)], hits: var seq[(float32, int16)],
numHits: var int,
size: Vec2, size: Vec2,
y: int, y: int,
partitions: seq[seq[(Segment, int16)]], partitions: seq[seq[(Segment, int16)]],
@ -921,7 +920,9 @@ template computeCoverages(
zeroMem(coverages[0].addr, coverages.len) zeroMem(coverages[0].addr, coverages.len)
# Do scanlines for this row # Do scanlines for this row
var yLine = y.float32 + initialOffset - offset var
yLine = y.float32 + initialOffset - offset
numHits: int
for m in 0 ..< quality: for m in 0 ..< quality:
yLine += offset yLine += offset
let scanline = line(vec2(0, yLine), vec2(size.x, yLine)) let scanline = line(vec2(0, yLine), vec2(size.x, yLine))
@ -955,8 +956,7 @@ template computeCoverages(
at - prevAt at - prevAt
if leftCover != 0: if leftCover != 0:
inc fillStart inc fillStart
coverages[prevAt.int] += coverages[prevAt.int] += (leftCover * sampleCoverage.float32).uint8
(leftCover * sampleCoverage.float32).uint8
if pixelCrossed: if pixelCrossed:
let rightCover = at - trunc(at) let rightCover = at - trunc(at)
@ -1001,18 +1001,21 @@ proc fillShapes(
blender = blendMode.blender() blender = blendMode.blender()
when defined(amd64) and not defined(pixieNoSimd): when defined(amd64) and not defined(pixieNoSimd):
let blenderSimd = blendMode.blenderSimd() let
blenderSimd = blendMode.blenderSimd()
first32 = cast[M128i]([uint32.high, 0, 0, 0]) # First 32 bits
oddMask = mm_set1_epi16(cast[int16](0xff00))
div255 = mm_set1_epi16(cast[int16](0x8081))
vColor = mm_set1_epi32(cast[int32](color))
var var
coverages = newSeq[uint8](image.width) coverages = newSeq[uint8](image.width)
hits = newSeq[(float32, int16)](4) hits = newSeq[(float32, int16)](4)
numHits: int
for y in startY ..< stopY: for y in startY ..< stopY:
computeCoverages( computeCoverages(
coverages, coverages,
hits, hits,
numHits,
image.wh, image.wh,
y, y,
partitions, partitions,
@ -1024,12 +1027,6 @@ proc fillShapes(
var x = startX var x = startX
when defined(amd64) and not defined(pixieNoSimd): when defined(amd64) and not defined(pixieNoSimd):
# When supported, SIMD blend as much as possible # When supported, SIMD blend as much as possible
let
first32 = cast[M128i]([uint32.high, 0, 0, 0]) # First 32 bits
oddMask = mm_set1_epi16(cast[int16](0xff00))
div255 = mm_set1_epi16(cast[int16](0x8081))
vColor = mm_set1_epi32(cast[int32](color))
for _ in countup(x, image.width - 16, 4): for _ in countup(x, image.width - 16, 4):
var coverage = mm_loadu_si128(coverages[x].addr) var coverage = mm_loadu_si128(coverages[x].addr)
coverage = mm_and_si128(coverage, first32) coverage = mm_and_si128(coverage, first32)
@ -1086,10 +1083,10 @@ proc fillShapes(
if coverage != 0: if coverage != 0:
var source = color var source = color
if coverage != 255: if coverage != 255:
source.r = ((color.r.uint16 * coverage) div 255).uint8 source.r = ((color.r.uint32 * coverage) div 255).uint8
source.g = ((color.g.uint16 * coverage) div 255).uint8 source.g = ((color.g.uint32 * coverage) div 255).uint8
source.b = ((color.b.uint16 * coverage) div 255).uint8 source.b = ((color.b.uint32 * coverage) div 255).uint8
source.a = ((color.a.uint16 * coverage) div 255).uint8 source.a = ((color.a.uint32 * coverage) div 255).uint8
if source.a == 255 and blendMode == bmNormal: if source.a == 255 and blendMode == bmNormal:
# Skip blending # Skip blending
@ -1122,13 +1119,11 @@ proc fillShapes(
var var
coverages = newSeq[uint8](mask.width) coverages = newSeq[uint8](mask.width)
hits = newSeq[(float32, int16)](4) hits = newSeq[(float32, int16)](4)
numHits: int
for y in startY ..< stopY: for y in startY ..< stopY:
computeCoverages( computeCoverages(
coverages, coverages,
hits, hits,
numHits,
mask.wh, mask.wh,
y, y,
partitions, partitions,