Skip to content

path fillHits refactor #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treeform merged 9 commits into from
Jun 17, 2022
Merged

path fillHits refactor #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
acd5a13
blend exports, renames
guzba Jun 16, 2022
cdc52f3
aligned rgba fill
guzba Jun 16, 2022
134b7d2
fillHits refactor
guzba Jun 16, 2022
dbf70e9
add tests for masking with gaps
guzba Jun 16, 2022
95e2863
masking skip 255
guzba Jun 16, 2022
ff3e7e3
formatting
guzba Jun 16, 2022
20fa9e5
better
guzba Jun 16, 2022
39f6c47
fix
guzba Jun 16, 2022
1aa738c
simpler
guzba Jun 17, 2022
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
153 changes: 92 additions & 61 deletions src/pixie/blends.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ proc SetSat(C: Color, s: float32): Color {.inline.} =
if satC > 0:
result = (C - min([C.r, C.g, C.b])) * s / satC

proc blendNormal*(backdrop, source: ColorRGBX): ColorRGBX =
proc blendNormal*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
if backdrop.a == 0 or source.a == 255:
return source
if source.a == 0:
Expand All @@ -152,7 +152,7 @@ proc blendNormal*(backdrop, source: ColorRGBX): ColorRGBX =
result.b = source.b + ((backdrop.b.uint32 * k) div 255).uint8
result.a = blendAlpha(backdrop.a, source.a)

proc blendDarken(backdrop, source: ColorRGBX): ColorRGBX =
proc blendDarken*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} =
Expand All @@ -166,7 +166,7 @@ proc blendDarken(backdrop, source: ColorRGBX): ColorRGBX =
result.b = blend(backdrop.b, backdrop.a, source.b, source.a)
result.a = blendAlpha(backdrop.a, source.a)

proc blendMultiply(backdrop, source: ColorRGBX): ColorRGBX =
proc blendMultiply*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} =
Expand All @@ -191,7 +191,7 @@ proc blendMultiply(backdrop, source: ColorRGBX): ColorRGBX =
# result = alphaFix(backdrop, source, result)
# result = result.toPremultipliedAlpha()

proc blendColorBurn(backdrop, source: ColorRGBX): ColorRGBX =
proc blendColorBurn*(backdrop, source: ColorRGBX): ColorRGBX =
let
backdrop = backdrop.rgba()
source = source.rgba()
Expand All @@ -208,7 +208,7 @@ proc blendColorBurn(backdrop, source: ColorRGBX): ColorRGBX =
blended.b = blend(backdrop.b, source.b)
result = alphaFix(backdrop, source, blended).rgbx()

proc blendLighten(backdrop, source: ColorRGBX): ColorRGBX =
proc blendLighten*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} =
Expand All @@ -222,7 +222,7 @@ proc blendLighten(backdrop, source: ColorRGBX): ColorRGBX =
result.b = blend(backdrop.b, backdrop.a, source.b, source.a)
result.a = blendAlpha(backdrop.a, source.a)

proc blendScreen(backdrop, source: ColorRGBX): ColorRGBX =
proc blendScreen*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
result.r = screen(backdrop.r, source.r)
result.g = screen(backdrop.g, source.g)
result.b = screen(backdrop.b, source.b)
Expand Down Expand Up @@ -255,13 +255,13 @@ proc blendColorDodge(backdrop, source: ColorRGBX): ColorRGBX =
blended.b = blend(backdrop.b, source.b)
result = alphaFix(backdrop, source, blended).rgbx()

proc blendOverlay(backdrop, source: ColorRGBX): ColorRGBX =
proc blendOverlay*(backdrop, source: ColorRGBX): ColorRGBX =
result.r = hardLight(source.r, source.a, backdrop.r, backdrop.a)
result.g = hardLight(source.g, source.a, backdrop.g, backdrop.a)
result.b = hardLight(source.b, source.a, backdrop.b, backdrop.a)
result.a = blendAlpha(backdrop.a, source.a)

proc blendSoftLight(backdrop, source: ColorRGBX): ColorRGBX =
proc blendSoftLight*(backdrop, source: ColorRGBX): ColorRGBX =
# proc softLight(backdrop, source: int32): uint8 {.inline.} =
# ## Pegtop
# (
Expand Down Expand Up @@ -335,7 +335,7 @@ proc blendSoftLight(backdrop, source: ColorRGBX): ColorRGBX =

result = rgba.rgbx()

proc blendHardLight(backdrop, source: ColorRGBX): ColorRGBX =
proc blendHardLight*(backdrop, source: ColorRGBX): ColorRGBX =
result.r = hardLight(backdrop.r, backdrop.a, source.r, source.a)
result.g = hardLight(backdrop.g, backdrop.a, source.g, source.a)
result.b = hardLight(backdrop.b, backdrop.a, source.b, source.a)
Expand Down Expand Up @@ -394,44 +394,64 @@ proc blendSaturation(backdrop, source: ColorRGBX): ColorRGBX =
blended = SetLum(SetSat(backdrop, Sat(source)), Lum(backdrop))
result = alphaFix(backdrop, source, blended).rgba.rgbx()

proc blendMask*(backdrop, source: ColorRGBX): ColorRGBX =
proc blendMask*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
let k = source.a.uint32
result.r = ((backdrop.r * k) div 255).uint8
result.g = ((backdrop.g * k) div 255).uint8
result.b = ((backdrop.b * k) div 255).uint8
result.a = ((backdrop.a * k) div 255).uint8

proc blendSubtractMask(backdrop, source: ColorRGBX): ColorRGBX =
proc blendSubtractMask*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
let a = (backdrop.a.uint32 * (255 - source.a)) div 255
result.r = ((backdrop.r * a) div 255).uint8
result.g = ((backdrop.g * a) div 255).uint8
result.b = ((backdrop.b * a) div 255).uint8
result.a = a.uint8

proc blendExcludeMask(backdrop, source: ColorRGBX): ColorRGBX =
proc blendExcludeMask*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
let a = max(backdrop.a, source.a).uint32 - min(backdrop.a, source.a)
result.r = ((source.r * a) div 255).uint8
result.g = ((source.g * a) div 255).uint8
result.b = ((source.b * a) div 255).uint8
result.a = a.uint8

proc blendOverwrite(backdrop, source: ColorRGBX): ColorRGBX =
proc normalBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendNormal(backdrop, source)

proc darkenBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendDarken(backdrop, source)

proc multiplyBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendMultiply(backdrop, source)

proc lightenBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendLighten(backdrop, source)

proc screenBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendScreen(backdrop, source)

proc maskBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendMask(backdrop, source)

proc overwriteBlender(backdrop, source: ColorRGBX): ColorRGBX =
source

# proc blendWhite(backdrop, source: ColorRGBX): ColorRGBX =
# ## For testing
# rgbx(255, 255, 255, 255)
proc subtractMaskBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendSubtractMask(backdrop, source)

proc excludeMaskBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendExcludeMask(backdrop, source)

proc blender*(blendMode: BlendMode): Blender {.raises: [].} =
## Returns a blend function for a given blend mode.
case blendMode:
of NormalBlend: blendNormal
of DarkenBlend: blendDarken
of MultiplyBlend: blendMultiply
of NormalBlend: normalBlender
of DarkenBlend: darkenBlender
of MultiplyBlend: multiplyBlender
# of BlendLinearBurn: blendLinearBurn
of ColorBurnBlend: blendColorBurn
of LightenBlend: blendLighten
of ScreenBlend: blendScreen
of LightenBlend: lightenBlender
of ScreenBlend: screenBlender
# of BlendLinearDodge: blendLinearDodge
of ColorDodgeBlend: blendColorDodge
of OverlayBlend: blendOverlay
Expand All @@ -443,39 +463,50 @@ proc blender*(blendMode: BlendMode): Blender {.raises: [].} =
of SaturationBlend: blendSaturation
of ColorBlend: blendColor
of LuminosityBlend: blendLuminosity
of MaskBlend: blendMask
of OverwriteBlend: blendOverwrite
of SubtractMaskBlend: blendSubtractMask
of ExcludeMaskBlend: blendExcludeMask
of MaskBlend: maskBlender
of OverwriteBlend: overwriteBlender
of SubtractMaskBlend: subtractMaskBlender
of ExcludeMaskBlend: excludeMaskBlender

proc maskNormal(backdrop, source: uint8): uint8 =
## Blending masks
proc maskBlendNormal*(backdrop, source: uint8): uint8 {.inline.} =
## Normal blend masks
blendAlpha(backdrop, source)

proc maskMaskInline*(backdrop, source: uint8): uint8 {.inline.} =
## Masking masks
proc maskBlendMask*(backdrop, source: uint8): uint8 {.inline.} =
## Mask blend masks
((backdrop.uint32 * source) div 255).uint8

proc maskMask(backdrop, source: uint8): uint8 =
maskMaskInline(backdrop, source)

proc maskSubtract(backdrop, source: uint8): uint8 =
proc maskBlendSubtract*(backdrop, source: uint8): uint8 {.inline.} =
## Subtract blend masks
((backdrop.uint32 * (255 - source)) div 255).uint8

proc maskExclude(backdrop, source: uint8): uint8 =
proc maskBlendExclude*(backdrop, source: uint8): uint8 {.inline.} =
## Exclude blend masks
max(backdrop, source) - min(backdrop, source)

proc maskOverwrite(backdrop, source: uint8): uint8 =
proc maskBlendNormalMasker(backdrop, source: uint8): uint8 =
maskBlendNormal(backdrop, source)

proc maskBlendMaskMasker(backdrop, source: uint8): uint8 =
maskBlendMask(backdrop, source)

proc maskBlendSubtractMasker(backdrop, source: uint8): uint8 =
maskBlendSubtract(backdrop, source)

proc maskBlendExcludeMasker(backdrop, source: uint8): uint8 =
maskBlendExclude(backdrop, source)

proc maskBlendOverwriteMasker(backdrop, source: uint8): uint8 =
source

proc masker*(blendMode: BlendMode): Masker {.raises: [PixieError].} =
## Returns a blend masking function for a given blend masking mode.
case blendMode:
of NormalBlend: maskNormal
of MaskBlend: maskMask
of OverwriteBlend: maskOverwrite
of SubtractMaskBlend: maskSubtract
of ExcludeMaskBlend: maskExclude
of NormalBlend: maskBlendNormalMasker
of MaskBlend: maskBlendMaskMasker
of OverwriteBlend: maskBlendOverwriteMasker
of SubtractMaskBlend: maskBlendSubtractMasker
of ExcludeMaskBlend: maskBlendExcludeMasker
else:
raise newException(PixieError, "No masker for " & $blendMode)

Expand All @@ -486,7 +517,7 @@ when defined(amd64) and allowSimd:
MaskerSimd* = proc(blackdrop, source: M128i): M128i {.gcsafe, raises: [].}
## Function signature returned by maskerSimd.

proc blendNormalInlineSimd*(backdrop, source: M128i): M128i {.inline.} =
proc blendNormalSimd*(backdrop, source: M128i): M128i {.inline.} =
let
alphaMask = mm_set1_epi32(cast[int32](0xff000000))
oddMask = mm_set1_epi16(cast[int16](0xff00))
Expand Down Expand Up @@ -515,10 +546,7 @@ when defined(amd64) and allowSimd:
mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))
)

proc blendNormalSimd(backdrop, source: M128i): M128i =
blendNormalInlineSimd(backdrop, source)

proc blendMaskInlineSimd*(backdrop, source: M128i): M128i {.inline.} =
proc blendMaskSimd*(backdrop, source: M128i): M128i {.inline.} =
let
alphaMask = mm_set1_epi32(cast[int32](0xff000000))
oddMask = mm_set1_epi16(cast[int16](0xff00))
Expand All @@ -539,26 +567,29 @@ when defined(amd64) and allowSimd:

mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))

proc blendMaskSimd(backdrop, source: M128i): M128i =
blendMaskInlineSimd(backdrop, source)
proc normalSimdBlender(backdrop, source: M128i): M128i =
blendNormalSimd(backdrop, source)

proc maskSimdBlender(backdrop, source: M128i): M128i =
blendMaskSimd(backdrop, source)

proc blendOverwriteSimd(backdrop, source: M128i): M128i =
proc overwriteSimdBlender(backdrop, source: M128i): M128i =
source

proc blenderSimd*(blendMode: BlendMode): BlenderSimd {.raises: [PixieError].} =
## Returns a blend function for a given blend mode with SIMD support.
case blendMode:
of NormalBlend: blendNormalSimd
of MaskBlend: blendMaskSimd
of OverwriteBlend: blendOverwriteSimd
of NormalBlend: normalSimdBlender
of MaskBlend: maskSimdBlender
of OverwriteBlend: overwriteSimdBlender
else:
raise newException(PixieError, "No SIMD blender for " & $blendMode)

proc hasSimdBlender*(blendMode: BlendMode): bool {.inline, raises: [].} =
## Is there a blend function for a given blend mode with SIMD support?
blendMode in {NormalBlend, MaskBlend, OverwriteBlend}

proc maskNormalInlineSimd*(backdrop, source: M128i): M128i {.inline.} =
proc maskBlendNormalSimd*(backdrop, source: M128i): M128i {.inline.} =
## Blending masks
let
oddMask = mm_set1_epi16(cast[int16](0xff00))
Expand Down Expand Up @@ -595,10 +626,7 @@ when defined(amd64) and allowSimd:

mm_or_si128(blendedEven, mm_slli_epi16(blendedOdd, 8))

proc maskNormalSimd(backdrop, source: M128i): M128i =
maskNormalInlineSimd(backdrop, source)

proc maskMaskInlineSimd*(backdrop, source: M128i): M128i =
proc maskBlendMaskSimd*(backdrop, source: M128i): M128i =
let
oddMask = mm_set1_epi16(cast[int16](0xff00))
div255 = mm_set1_epi16(cast[int16](0x8081))
Expand All @@ -619,15 +647,18 @@ when defined(amd64) and allowSimd:

mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))

proc maskMaskSimd(backdrop, source: M128i): M128i =
maskMaskInlineSimd(backdrop, source)
proc maskBlendNormalSimdMasker(backdrop, source: M128i): M128i =
maskBlendNormalSimd(backdrop, source)

proc maskBlendMaskSimdMasker(backdrop, source: M128i): M128i =
maskBlendMaskSimd(backdrop, source)

proc maskerSimd*(blendMode: BlendMode): MaskerSimd {.raises: [PixieError].} =
## Returns a blend masking function with SIMD support.
case blendMode:
of NormalBlend: maskNormalSimd
of MaskBlend: maskMaskSimd
of OverwriteBlend: blendOverwriteSimd
of NormalBlend: maskBlendNormalSimdMasker
of MaskBlend: maskBlendMaskSimdMasker
of OverwriteBlend: overwriteSimdBlender
else:
raise newException(PixieError, "No SIMD masker for " & $blendMode)

Expand Down
14 changes: 7 additions & 7 deletions src/pixie/images.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ proc drawUber(
backdropVec = mm_loadu_si128(a.data[backdropIdx].addr)
mm_storeu_si128(
a.data[backdropIdx].addr,
blendNormalInlineSimd(backdropVec, sourceVec)
blendNormalSimd(backdropVec, sourceVec)
)
else: # b is a Mask
var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
Expand All @@ -865,7 +865,7 @@ proc drawUber(
backdropVec = mm_loadu_si128(a.data[backdropIdx].addr)
mm_storeu_si128(
a.data[backdropIdx].addr,
blendNormalInlineSimd(backdropVec, sourceVec)
blendNormalSimd(backdropVec, sourceVec)
)
# Shuffle 32 bits off for the next iteration
values = mm_srli_si128(values, 4)
Expand All @@ -882,7 +882,7 @@ proc drawUber(
let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
mm_storeu_si128(
a.data[a.dataIndex(x, y)].addr,
maskNormalInlineSimd(backdropVec, sourceVec)
maskBlendNormalSimd(backdropVec, sourceVec)
)
x += 16
sx += 16
Expand All @@ -904,7 +904,7 @@ proc drawUber(
let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr)
mm_storeu_si128(
a.data[a.dataIndex(x + q, y)].addr,
blendMaskInlineSimd(backdropVec, sourceVec)
blendMaskSimd(backdropVec, sourceVec)
)
else: # b is a Mask
var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
Expand All @@ -922,7 +922,7 @@ proc drawUber(
let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr)
mm_storeu_si128(
a.data[a.dataIndex(x + q, y)].addr,
blendMaskInlineSimd(backdropVec, sourceVec)
blendMaskSimd(backdropVec, sourceVec)
)
# Shuffle 32 bits off for the next iteration
values = mm_srli_si128(values, 4)
Expand All @@ -939,7 +939,7 @@ proc drawUber(
let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
mm_storeu_si128(
a.data[a.dataIndex(x, y)].addr,
maskMaskInlineSimd(backdropVec, sourceVec)
maskBlendMaskSimd(backdropVec, sourceVec)
)
x += 16
sx += 16
Expand Down Expand Up @@ -1067,7 +1067,7 @@ proc drawUber(
a.unsafe[x, y] = 0
elif source != 255:
let backdrop = a.unsafe[x, y]
a.unsafe[x, y] = maskMaskInline(backdrop, source)
a.unsafe[x, y] = maskBlendMask(backdrop, source)
srcPos += dx
else:
for x in x ..< xStop:
Expand Down
Loading