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

blend exports, renames

Browse source
This commit is contained in:
Ryan Oldenburg 2022-06-15 21:55:50 -05:00
parent f96f7a5d49
commit acd5a13763
4 changed files with 109 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
src/pixie/blends.nim
View file

@ -140,7 +140,7 @@ proc SetSat(C: Color, s: float32): Color {.inline.} =
if satC > 0: if satC > 0:
result = (C - min([C.r, C.g, C.b])) * s / satC 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: if backdrop.a == 0 or source.a == 255:
return source return source
if source.a == 0: if source.a == 0:
@ -152,7 +152,7 @@ proc blendNormal*(backdrop, source: ColorRGBX): ColorRGBX =
result.b = source.b + ((backdrop.b.uint32 * k) div 255).uint8 result.b = source.b + ((backdrop.b.uint32 * k) div 255).uint8
result.a = blendAlpha(backdrop.a, source.a) result.a = blendAlpha(backdrop.a, source.a)
proc blendDarken(backdrop, source: ColorRGBX): ColorRGBX = proc blendDarken*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend( proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8 backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} = ): uint8 {.inline.} =
@ -166,7 +166,7 @@ proc blendDarken(backdrop, source: ColorRGBX): ColorRGBX =
result.b = blend(backdrop.b, backdrop.a, source.b, source.a) result.b = blend(backdrop.b, backdrop.a, source.b, source.a)
result.a = blendAlpha(backdrop.a, source.a) result.a = blendAlpha(backdrop.a, source.a)
proc blendMultiply(backdrop, source: ColorRGBX): ColorRGBX = proc blendMultiply*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend( proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8 backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} = ): uint8 {.inline.} =
@ -191,7 +191,7 @@ proc blendMultiply(backdrop, source: ColorRGBX): ColorRGBX =
# result = alphaFix(backdrop, source, result) # result = alphaFix(backdrop, source, result)
# result = result.toPremultipliedAlpha() # result = result.toPremultipliedAlpha()
proc blendColorBurn(backdrop, source: ColorRGBX): ColorRGBX = proc blendColorBurn*(backdrop, source: ColorRGBX): ColorRGBX =
let let
backdrop = backdrop.rgba() backdrop = backdrop.rgba()
source = source.rgba() source = source.rgba()
@ -208,7 +208,7 @@ proc blendColorBurn(backdrop, source: ColorRGBX): ColorRGBX =
blended.b = blend(backdrop.b, source.b) blended.b = blend(backdrop.b, source.b)
result = alphaFix(backdrop, source, blended).rgbx() result = alphaFix(backdrop, source, blended).rgbx()
proc blendLighten(backdrop, source: ColorRGBX): ColorRGBX = proc blendLighten*(backdrop, source: ColorRGBX): ColorRGBX {.inline.} =
proc blend( proc blend(
backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8 backdropColor, backdropAlpha, sourceColor, sourceAlpha: uint8
): uint8 {.inline.} = ): uint8 {.inline.} =
@ -222,7 +222,7 @@ proc blendLighten(backdrop, source: ColorRGBX): ColorRGBX =
result.b = blend(backdrop.b, backdrop.a, source.b, source.a) result.b = blend(backdrop.b, backdrop.a, source.b, source.a)
result.a = blendAlpha(backdrop.a, 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.r = screen(backdrop.r, source.r)
result.g = screen(backdrop.g, source.g) result.g = screen(backdrop.g, source.g)
result.b = screen(backdrop.b, source.b) result.b = screen(backdrop.b, source.b)
@ -255,13 +255,13 @@ proc blendColorDodge(backdrop, source: ColorRGBX): ColorRGBX =
blended.b = blend(backdrop.b, source.b) blended.b = blend(backdrop.b, source.b)
result = alphaFix(backdrop, source, blended).rgbx() 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.r = hardLight(source.r, source.a, backdrop.r, backdrop.a)
result.g = hardLight(source.g, source.a, backdrop.g, 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.b = hardLight(source.b, source.a, backdrop.b, backdrop.a)
result.a = blendAlpha(backdrop.a, source.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.} = # proc softLight(backdrop, source: int32): uint8 {.inline.} =
# ## Pegtop # ## Pegtop
# ( # (
@ -335,7 +335,7 @@ proc blendSoftLight(backdrop, source: ColorRGBX): ColorRGBX =
result = rgba.rgbx() 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.r = hardLight(backdrop.r, backdrop.a, source.r, source.a)
result.g = hardLight(backdrop.g, backdrop.a, source.g, source.a) result.g = hardLight(backdrop.g, backdrop.a, source.g, source.a)
result.b = hardLight(backdrop.b, backdrop.a, source.b, source.a) result.b = hardLight(backdrop.b, backdrop.a, source.b, source.a)
@ -394,44 +394,64 @@ proc blendSaturation(backdrop, source: ColorRGBX): ColorRGBX =
blended = SetLum(SetSat(backdrop, Sat(source)), Lum(backdrop)) blended = SetLum(SetSat(backdrop, Sat(source)), Lum(backdrop))
result = alphaFix(backdrop, source, blended).rgba.rgbx() 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 let k = source.a.uint32
result.r = ((backdrop.r * k) div 255).uint8 result.r = ((backdrop.r * k) div 255).uint8
result.g = ((backdrop.g * k) div 255).uint8 result.g = ((backdrop.g * k) div 255).uint8
result.b = ((backdrop.b * k) div 255).uint8 result.b = ((backdrop.b * k) div 255).uint8
result.a = ((backdrop.a * 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 let a = (backdrop.a.uint32 * (255 - source.a)) div 255
result.r = ((backdrop.r * a) div 255).uint8 result.r = ((backdrop.r * a) div 255).uint8
result.g = ((backdrop.g * a) div 255).uint8 result.g = ((backdrop.g * a) div 255).uint8
result.b = ((backdrop.b * a) div 255).uint8 result.b = ((backdrop.b * a) div 255).uint8
result.a = a.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) let a = max(backdrop.a, source.a).uint32 - min(backdrop.a, source.a)
result.r = ((source.r * a) div 255).uint8 result.r = ((source.r * a) div 255).uint8
result.g = ((source.g * a) div 255).uint8 result.g = ((source.g * a) div 255).uint8
result.b = ((source.b * a) div 255).uint8 result.b = ((source.b * a) div 255).uint8
result.a = a.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 source
# proc blendWhite(backdrop, source: ColorRGBX): ColorRGBX = proc subtractMaskBlender(backdrop, source: ColorRGBX): ColorRGBX =
# ## For testing blendSubtractMask(backdrop, source)
# rgbx(255, 255, 255, 255)
proc excludeMaskBlender(backdrop, source: ColorRGBX): ColorRGBX =
blendExcludeMask(backdrop, source)
proc blender*(blendMode: BlendMode): Blender {.raises: [].} = proc blender*(blendMode: BlendMode): Blender {.raises: [].} =
## Returns a blend function for a given blend mode. ## Returns a blend function for a given blend mode.
case blendMode: case blendMode:
of NormalBlend: blendNormal of NormalBlend: normalBlender
of DarkenBlend: blendDarken of DarkenBlend: darkenBlender
of MultiplyBlend: blendMultiply of MultiplyBlend: multiplyBlender
# of BlendLinearBurn: blendLinearBurn # of BlendLinearBurn: blendLinearBurn
of ColorBurnBlend: blendColorBurn of ColorBurnBlend: blendColorBurn
of LightenBlend: blendLighten of LightenBlend: lightenBlender
of ScreenBlend: blendScreen of ScreenBlend: screenBlender
# of BlendLinearDodge: blendLinearDodge # of BlendLinearDodge: blendLinearDodge
of ColorDodgeBlend: blendColorDodge of ColorDodgeBlend: blendColorDodge
of OverlayBlend: blendOverlay of OverlayBlend: blendOverlay
@ -443,39 +463,50 @@ proc blender*(blendMode: BlendMode): Blender {.raises: [].} =
of SaturationBlend: blendSaturation of SaturationBlend: blendSaturation
of ColorBlend: blendColor of ColorBlend: blendColor
of LuminosityBlend: blendLuminosity of LuminosityBlend: blendLuminosity
of MaskBlend: blendMask of MaskBlend: maskBlender
of OverwriteBlend: blendOverwrite of OverwriteBlend: overwriteBlender
of SubtractMaskBlend: blendSubtractMask of SubtractMaskBlend: subtractMaskBlender
of ExcludeMaskBlend: blendExcludeMask of ExcludeMaskBlend: excludeMaskBlender
proc maskNormal(backdrop, source: uint8): uint8 = proc maskBlendNormal*(backdrop, source: uint8): uint8 {.inline.} =
## Blending masks ## Normal blend masks
blendAlpha(backdrop, source) blendAlpha(backdrop, source)
proc maskMaskInline*(backdrop, source: uint8): uint8 {.inline.} = proc maskBlendMask*(backdrop, source: uint8): uint8 {.inline.} =
## Masking masks ## Mask blend masks
((backdrop.uint32 * source) div 255).uint8 ((backdrop.uint32 * source) div 255).uint8
proc maskMask(backdrop, source: uint8): uint8 = proc maskBlendSubtract*(backdrop, source: uint8): uint8 {.inline.} =
maskMaskInline(backdrop, source) ## Subtract blend masks
proc maskSubtract(backdrop, source: uint8): uint8 =
((backdrop.uint32 * (255 - source)) div 255).uint8 ((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) 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 source
proc masker*(blendMode: BlendMode): Masker {.raises: [PixieError].} = proc masker*(blendMode: BlendMode): Masker {.raises: [PixieError].} =
## Returns a blend masking function for a given blend masking mode. ## Returns a blend masking function for a given blend masking mode.
case blendMode: case blendMode:
of NormalBlend: maskNormal of NormalBlend: maskBlendNormalMasker
of MaskBlend: maskMask of MaskBlend: maskBlendMaskMasker
of OverwriteBlend: maskOverwrite of OverwriteBlend: maskBlendOverwriteMasker
of SubtractMaskBlend: maskSubtract of SubtractMaskBlend: maskBlendSubtractMasker
of ExcludeMaskBlend: maskExclude of ExcludeMaskBlend: maskBlendExcludeMasker
else: else:
raise newException(PixieError, "No masker for " & $blendMode) raise newException(PixieError, "No masker for " & $blendMode)
@ -486,7 +517,7 @@ when defined(amd64) and allowSimd:
MaskerSimd* = proc(blackdrop, source: M128i): M128i {.gcsafe, raises: [].} MaskerSimd* = proc(blackdrop, source: M128i): M128i {.gcsafe, raises: [].}
## Function signature returned by maskerSimd. ## Function signature returned by maskerSimd.
proc blendNormalInlineSimd*(backdrop, source: M128i): M128i {.inline.} = proc blendNormalSimd*(backdrop, source: M128i): M128i {.inline.} =
let let
alphaMask = mm_set1_epi32(cast[int32](0xff000000)) alphaMask = mm_set1_epi32(cast[int32](0xff000000))
oddMask = mm_set1_epi16(cast[int16](0xff00)) oddMask = mm_set1_epi16(cast[int16](0xff00))
@ -515,10 +546,7 @@ when defined(amd64) and allowSimd:
mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8)) mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))
) )
proc blendNormalSimd(backdrop, source: M128i): M128i = proc blendMaskSimd*(backdrop, source: M128i): M128i {.inline.} =
blendNormalInlineSimd(backdrop, source)
proc blendMaskInlineSimd*(backdrop, source: M128i): M128i {.inline.} =
let let
alphaMask = mm_set1_epi32(cast[int32](0xff000000)) alphaMask = mm_set1_epi32(cast[int32](0xff000000))
oddMask = mm_set1_epi16(cast[int16](0xff00)) oddMask = mm_set1_epi16(cast[int16](0xff00))
@ -539,18 +567,21 @@ when defined(amd64) and allowSimd:
mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8)) mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))
proc blendMaskSimd(backdrop, source: M128i): M128i = proc normalSimdBlender(backdrop, source: M128i): M128i =
blendMaskInlineSimd(backdrop, source) blendNormalSimd(backdrop, source)
proc blendOverwriteSimd(backdrop, source: M128i): M128i = proc maskSimdBlender(backdrop, source: M128i): M128i =
blendMaskSimd(backdrop, source)
proc overwriteSimdBlender(backdrop, source: M128i): M128i =
source source
proc blenderSimd*(blendMode: BlendMode): BlenderSimd {.raises: [PixieError].} = proc blenderSimd*(blendMode: BlendMode): BlenderSimd {.raises: [PixieError].} =
## Returns a blend function for a given blend mode with SIMD support. ## Returns a blend function for a given blend mode with SIMD support.
case blendMode: case blendMode:
of NormalBlend: blendNormalSimd of NormalBlend: normalSimdBlender
of MaskBlend: blendMaskSimd of MaskBlend: maskSimdBlender
of OverwriteBlend: blendOverwriteSimd of OverwriteBlend: overwriteSimdBlender
else: else:
raise newException(PixieError, "No SIMD blender for " & $blendMode) raise newException(PixieError, "No SIMD blender for " & $blendMode)
@ -558,7 +589,7 @@ when defined(amd64) and allowSimd:
## Is there a blend function for a given blend mode with SIMD support? ## Is there a blend function for a given blend mode with SIMD support?
blendMode in {NormalBlend, MaskBlend, OverwriteBlend} blendMode in {NormalBlend, MaskBlend, OverwriteBlend}
proc maskNormalInlineSimd*(backdrop, source: M128i): M128i {.inline.} = proc maskBlendNormalSimd*(backdrop, source: M128i): M128i {.inline.} =
## Blending masks ## Blending masks
let let
oddMask = mm_set1_epi16(cast[int16](0xff00)) oddMask = mm_set1_epi16(cast[int16](0xff00))
@ -595,10 +626,7 @@ when defined(amd64) and allowSimd:
mm_or_si128(blendedEven, mm_slli_epi16(blendedOdd, 8)) mm_or_si128(blendedEven, mm_slli_epi16(blendedOdd, 8))
proc maskNormalSimd(backdrop, source: M128i): M128i = proc maskBlendMaskSimd*(backdrop, source: M128i): M128i =
maskNormalInlineSimd(backdrop, source)
proc maskMaskInlineSimd*(backdrop, source: M128i): M128i =
let let
oddMask = mm_set1_epi16(cast[int16](0xff00)) oddMask = mm_set1_epi16(cast[int16](0xff00))
div255 = mm_set1_epi16(cast[int16](0x8081)) div255 = mm_set1_epi16(cast[int16](0x8081))
@ -619,15 +647,18 @@ when defined(amd64) and allowSimd:
mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8)) mm_or_si128(backdropEven, mm_slli_epi16(backdropOdd, 8))
proc maskMaskSimd(backdrop, source: M128i): M128i = proc maskBlendNormalSimdMasker(backdrop, source: M128i): M128i =
maskMaskInlineSimd(backdrop, source) maskBlendNormalSimd(backdrop, source)
proc maskBlendMaskSimdMasker(backdrop, source: M128i): M128i =
maskBlendMaskSimd(backdrop, source)
proc maskerSimd*(blendMode: BlendMode): MaskerSimd {.raises: [PixieError].} = proc maskerSimd*(blendMode: BlendMode): MaskerSimd {.raises: [PixieError].} =
## Returns a blend masking function with SIMD support. ## Returns a blend masking function with SIMD support.
case blendMode: case blendMode:
of NormalBlend: maskNormalSimd of NormalBlend: maskBlendNormalSimdMasker
of MaskBlend: maskMaskSimd of MaskBlend: maskBlendMaskSimdMasker
of OverwriteBlend: blendOverwriteSimd of OverwriteBlend: overwriteSimdBlender
else: else:
raise newException(PixieError, "No SIMD masker for " & $blendMode) raise newException(PixieError, "No SIMD masker for " & $blendMode)

14
src/pixie/images.nim
View file

@ -847,7 +847,7 @@ proc drawUber(
backdropVec = mm_loadu_si128(a.data[backdropIdx].addr) backdropVec = mm_loadu_si128(a.data[backdropIdx].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[backdropIdx].addr, a.data[backdropIdx].addr,
blendNormalInlineSimd(backdropVec, sourceVec) blendNormalSimd(backdropVec, sourceVec)
) )
else: # b is a Mask else: # b is a Mask
var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr) var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
@ -865,7 +865,7 @@ proc drawUber(
backdropVec = mm_loadu_si128(a.data[backdropIdx].addr) backdropVec = mm_loadu_si128(a.data[backdropIdx].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[backdropIdx].addr, a.data[backdropIdx].addr,
blendNormalInlineSimd(backdropVec, sourceVec) blendNormalSimd(backdropVec, sourceVec)
) )
# Shuffle 32 bits off for the next iteration # Shuffle 32 bits off for the next iteration
values = mm_srli_si128(values, 4) values = mm_srli_si128(values, 4)
@ -882,7 +882,7 @@ proc drawUber(
let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr) let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[a.dataIndex(x, y)].addr, a.data[a.dataIndex(x, y)].addr,
maskNormalInlineSimd(backdropVec, sourceVec) maskBlendNormalSimd(backdropVec, sourceVec)
) )
x += 16 x += 16
sx += 16 sx += 16
@ -904,7 +904,7 @@ proc drawUber(
let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr) let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[a.dataIndex(x + q, y)].addr, a.data[a.dataIndex(x + q, y)].addr,
blendMaskInlineSimd(backdropVec, sourceVec) blendMaskSimd(backdropVec, sourceVec)
) )
else: # b is a Mask else: # b is a Mask
var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr) var values = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
@ -922,7 +922,7 @@ proc drawUber(
let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr) let backdropVec = mm_loadu_si128(a.data[a.dataIndex(x + q, y)].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[a.dataIndex(x + q, y)].addr, a.data[a.dataIndex(x + q, y)].addr,
blendMaskInlineSimd(backdropVec, sourceVec) blendMaskSimd(backdropVec, sourceVec)
) )
# Shuffle 32 bits off for the next iteration # Shuffle 32 bits off for the next iteration
values = mm_srli_si128(values, 4) values = mm_srli_si128(values, 4)
@ -939,7 +939,7 @@ proc drawUber(
let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr) let sourceVec = mm_loadu_si128(b.data[b.dataIndex(sx, sy)].addr)
mm_storeu_si128( mm_storeu_si128(
a.data[a.dataIndex(x, y)].addr, a.data[a.dataIndex(x, y)].addr,
maskMaskInlineSimd(backdropVec, sourceVec) maskBlendMaskSimd(backdropVec, sourceVec)
) )
x += 16 x += 16
sx += 16 sx += 16
@ -1067,7 +1067,7 @@ proc drawUber(
a.unsafe[x, y] = 0 a.unsafe[x, y] = 0
elif source != 255: elif source != 255:
let backdrop = a.unsafe[x, y] let backdrop = a.unsafe[x, y]
a.unsafe[x, y] = maskMaskInline(backdrop, source) a.unsafe[x, y] = maskBlendMask(backdrop, source)
srcPos += dx srcPos += dx
else: else:
for x in x ..< xStop: for x in x ..< xStop:

8
src/pixie/internal.nim
View file

@ -1,4 +1,4 @@
import chroma, system/memory, vmath import chroma, common, system/memory, vmath
const allowSimd* = not defined(pixieNoSimd) and not defined(tcc) const allowSimd* = not defined(pixieNoSimd) and not defined(tcc)
@ -10,6 +10,12 @@ template currentExceptionAsPixieError*(): untyped =
let e = getCurrentException() let e = getCurrentException()
newException(PixieError, e.getStackTrace & e.msg, e) newException(PixieError, e.getStackTrace & e.msg, e)
template failUnsupportedBlendMode*(blendMode: BlendMode) =
raise newException(
PixieError,
"Blend mode " & $blendMode & " not supported here"
)
when defined(release): when defined(release):
{.push checks: off.} {.push checks: off.}

6
src/pixie/paths.nim
View file

@ -1372,7 +1372,7 @@ proc fillCoverage(
let backdrop = mm_loadu_si128(image.data[index + i * 4].addr) let backdrop = mm_loadu_si128(image.data[index + i * 4].addr)
mm_storeu_si128( mm_storeu_si128(
image.data[index + i * 4].addr, image.data[index + i * 4].addr,
blendNormalInlineSimd(backdrop, colorVec) blendNormalSimd(backdrop, colorVec)
) )
else: else:
for i in 0 ..< 4: for i in 0 ..< 4:
@ -1415,7 +1415,7 @@ proc fillCoverage(
coverageVec = mm_srli_si128(coverageVec, 4) coverageVec = mm_srli_si128(coverageVec, 4)
if blendMode == NormalBlend: if blendMode == NormalBlend:
useCoverage(blendNormalInlineSimd) useCoverage(blendNormalSimd)
else: else:
useCoverage(blenderSimd) useCoverage(blenderSimd)
@ -1537,7 +1537,7 @@ proc fillHits(
backdrop = mm_loadu_si128(image.data[index].addr) backdrop = mm_loadu_si128(image.data[index].addr)
mm_storeu_si128( mm_storeu_si128(
image.data[index].addr, image.data[index].addr,
blendNormalInlineSimd(backdrop, colorVec) blendNormalSimd(backdrop, colorVec)
) )
x += 4 x += 4
else: else: