e78c45720c
name old time/op new time/op delta GlyphAlphaLoose16Over-8 3.96µs ± 0% 3.64µs ± 1% -8.08% (p=0.000 n=8+10) GlyphAlphaLoose16Src-8 3.64µs ± 0% 3.35µs ± 0% -7.88% (p=0.000 n=8+9) GlyphAlphaLoose32Over-8 8.45µs ± 0% 6.74µs ± 0% -20.22% (p=0.000 n=8+9) GlyphAlphaLoose32Src-8 7.24µs ± 0% 5.54µs ± 1% -23.48% (p=0.000 n=8+10) GlyphAlphaLoose64Over-8 22.2µs ± 0% 17.4µs ± 0% -21.67% (p=0.000 n=9+9) GlyphAlphaLoose64Src-8 17.6µs ± 1% 12.2µs ± 1% -30.32% (p=0.000 n=10+10) GlyphAlphaLoose128Over-8 67.9µs ± 0% 53.3µs ± 1% -21.53% (p=0.000 n=10+10) GlyphAlphaLoose128Src-8 48.2µs ± 0% 32.6µs ± 2% -32.41% (p=0.000 n=9+10) GlyphAlphaLoose256Over-8 242µs ± 1% 187µs ± 1% -22.96% (p=0.000 n=9+9) GlyphAlphaLoose256Src-8 163µs ± 0% 105µs ± 1% -35.83% (p=0.000 n=9+9) GlyphRGBA16Over-8 5.25µs ± 1% 4.95µs ± 0% -5.78% (p=0.000 n=9+9) GlyphRGBA16Src-8 4.72µs ± 0% 4.43µs ± 1% -6.22% (p=0.000 n=9+10) GlyphRGBA32Over-8 13.5µs ± 0% 11.9µs ± 1% -12.19% (p=0.000 n=9+10) GlyphRGBA32Src-8 11.5µs ± 1% 9.8µs ± 0% -14.72% (p=0.000 n=9+9) GlyphRGBA64Over-8 42.0µs ± 2% 36.9µs ± 1% -12.19% (p=0.000 n=10+10) GlyphRGBA64Src-8 34.1µs ± 1% 28.5µs ± 0% -16.25% (p=0.000 n=9+7) GlyphRGBA128Over-8 149µs ± 2% 133µs ± 1% -10.24% (p=0.000 n=10+9) GlyphRGBA128Src-8 115µs ± 1% 99µs ± 1% -13.57% (p=0.000 n=9+10) GlyphRGBA256Over-8 566µs ± 0% 511µs ± 1% -9.85% (p=0.000 n=9+10) GlyphRGBA256Src-8 435µs ± 0% 372µs ± 0% -14.64% (p=0.000 n=9+8) GlyphNRGBA16Over-8 26.9µs ± 3% 26.0µs ± 3% -3.55% (p=0.000 n=10+9) GlyphNRGBA16Src-8 18.8µs ± 2% 18.4µs ± 2% -2.21% (p=0.000 n=9+10) GlyphNRGBA32Over-8 99.1µs ± 2% 95.9µs ± 3% -3.23% (p=0.000 n=10+10) GlyphNRGBA32Src-8 65.6µs ± 3% 62.8µs ± 2% -4.36% (p=0.000 n=10+10) GlyphNRGBA64Over-8 376µs ± 4% 370µs ± 2% ~ (p=0.063 n=10+10) GlyphNRGBA64Src-8 238µs ± 3% 233µs ± 1% -2.21% (p=0.000 n=9+10) GlyphNRGBA128Over-8 1.52ms ± 2% 1.48ms ± 0% -2.11% (p=0.000 n=10+8) GlyphNRGBA128Src-8 951µs ± 3% 935µs ± 1% -1.69% (p=0.013 n=10+9) GlyphNRGBA256Over-8 6.00ms ± 1% 5.87ms ± 3% -2.12% (p=0.002 n=10+10) GlyphNRGBA256Src-8 3.94ms ± 2% 3.80ms ± 2% -3.64% (p=0.000 n=10+10) A comparison of the non-SIMD and SIMD versions: name time/op FixedAccumulateMask16-8 237ns ± 0% FixedAccumulateMaskSIMD16-8 80.0ns ± 1% FloatingAccumulateMask16-8 413ns ± 2% FloatingAccumulateMaskSIMD16-8 166ns ± 0% FixedAccumulateMask64-8 3.42µs ± 0% FixedAccumulateMaskSIMD64-8 1.09µs ± 0% FloatingAccumulateMask64-8 6.92µs ± 0% FloatingAccumulateMaskSIMD64-8 2.47µs ± 1% Change-Id: Ib6980e5975ed2842ff2a372f76dd5f2e95c5526c Reviewed-on: https://go-review.googlesource.com/30898 Reviewed-by: David Crawshaw <crawshaw@golang.org>
211 lines
4.6 KiB
Go
211 lines
4.6 KiB
Go
// Copyright 2016 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package vector
|
|
|
|
// This file contains a floating point math implementation of the vector
|
|
// graphics rasterizer.
|
|
|
|
import (
|
|
"math"
|
|
|
|
"golang.org/x/image/math/f32"
|
|
)
|
|
|
|
func floatingMax(x, y float32) float32 {
|
|
if x > y {
|
|
return x
|
|
}
|
|
return y
|
|
}
|
|
|
|
func floatingMin(x, y float32) float32 {
|
|
if x < y {
|
|
return x
|
|
}
|
|
return y
|
|
}
|
|
|
|
func floatingFloor(x float32) int32 { return int32(math.Floor(float64(x))) }
|
|
func floatingCeil(x float32) int32 { return int32(math.Ceil(float64(x))) }
|
|
|
|
func (z *Rasterizer) floatingLineTo(b f32.Vec2) {
|
|
a := z.pen
|
|
z.pen = b
|
|
dir := float32(1)
|
|
if a[1] > b[1] {
|
|
dir, a, b = -1, b, a
|
|
}
|
|
// Horizontal line segments yield no change in coverage. Almost horizontal
|
|
// segments would yield some change, in ideal math, but the computation
|
|
// further below, involving 1 / (b[1] - a[1]), is unstable in floating
|
|
// point math, so we treat the segment as if it was perfectly horizontal.
|
|
if b[1]-a[1] <= 0.000001 {
|
|
return
|
|
}
|
|
dxdy := (b[0] - a[0]) / (b[1] - a[1])
|
|
|
|
x := a[0]
|
|
y := floatingFloor(a[1])
|
|
yMax := floatingCeil(b[1])
|
|
if yMax > int32(z.size.Y) {
|
|
yMax = int32(z.size.Y)
|
|
}
|
|
width := int32(z.size.X)
|
|
|
|
for ; y < yMax; y++ {
|
|
dy := floatingMin(float32(y+1), b[1]) - floatingMax(float32(y), a[1])
|
|
xNext := x + dy*dxdy
|
|
if y < 0 {
|
|
x = xNext
|
|
continue
|
|
}
|
|
buf := z.bufF32[y*width:]
|
|
d := dy * dir
|
|
x0, x1 := x, xNext
|
|
if x > xNext {
|
|
x0, x1 = x1, x0
|
|
}
|
|
x0i := floatingFloor(x0)
|
|
x0Floor := float32(x0i)
|
|
x1i := floatingCeil(x1)
|
|
x1Ceil := float32(x1i)
|
|
|
|
if x1i <= x0i+1 {
|
|
xmf := 0.5*(x+xNext) - x0Floor
|
|
if i := clamp(x0i+0, width); i < uint(len(buf)) {
|
|
buf[i] += d - d*xmf
|
|
}
|
|
if i := clamp(x0i+1, width); i < uint(len(buf)) {
|
|
buf[i] += d * xmf
|
|
}
|
|
} else {
|
|
s := 1 / (x1 - x0)
|
|
x0f := x0 - x0Floor
|
|
oneMinusX0f := 1 - x0f
|
|
a0 := 0.5 * s * oneMinusX0f * oneMinusX0f
|
|
x1f := x1 - x1Ceil + 1
|
|
am := 0.5 * s * x1f * x1f
|
|
|
|
if i := clamp(x0i, width); i < uint(len(buf)) {
|
|
buf[i] += d * a0
|
|
}
|
|
|
|
if x1i == x0i+2 {
|
|
if i := clamp(x0i+1, width); i < uint(len(buf)) {
|
|
buf[i] += d * (1 - a0 - am)
|
|
}
|
|
} else {
|
|
a1 := s * (1.5 - x0f)
|
|
if i := clamp(x0i+1, width); i < uint(len(buf)) {
|
|
buf[i] += d * (a1 - a0)
|
|
}
|
|
dTimesS := d * s
|
|
for xi := x0i + 2; xi < x1i-1; xi++ {
|
|
if i := clamp(xi, width); i < uint(len(buf)) {
|
|
buf[i] += dTimesS
|
|
}
|
|
}
|
|
a2 := a1 + s*float32(x1i-x0i-3)
|
|
if i := clamp(x1i-1, width); i < uint(len(buf)) {
|
|
buf[i] += d * (1 - a2 - am)
|
|
}
|
|
}
|
|
|
|
if i := clamp(x1i, width); i < uint(len(buf)) {
|
|
buf[i] += d * am
|
|
}
|
|
}
|
|
|
|
x = xNext
|
|
}
|
|
}
|
|
|
|
const (
|
|
// almost256 scales a floating point value in the range [0, 1] to a uint8
|
|
// value in the range [0x00, 0xff].
|
|
//
|
|
// 255 is too small. Floating point math accumulates rounding errors, so a
|
|
// fully covered src value that would in ideal math be float32(1) might be
|
|
// float32(1-ε), and uint8(255 * (1-ε)) would be 0xfe instead of 0xff. The
|
|
// uint8 conversion rounds to zero, not to nearest.
|
|
//
|
|
// 256 is too big. If we multiplied by 256, below, then a fully covered src
|
|
// value of float32(1) would translate to uint8(256 * 1), which can be 0x00
|
|
// instead of the maximal value 0xff.
|
|
//
|
|
// math.Float32bits(almost256) is 0x437fffff.
|
|
almost256 = 255.99998
|
|
|
|
// almost65536 scales a floating point value in the range [0, 1] to a
|
|
// uint16 value in the range [0x0000, 0xffff].
|
|
//
|
|
// math.Float32bits(almost65536) is 0x477fffff.
|
|
almost65536 = almost256 * 256
|
|
)
|
|
|
|
func floatingAccumulateOpOver(dst []uint8, src []float32) {
|
|
// Sanity check that len(dst) >= len(src).
|
|
if len(dst) < len(src) {
|
|
return
|
|
}
|
|
|
|
acc := float32(0)
|
|
for i, v := range src {
|
|
acc += v
|
|
a := acc
|
|
if a < 0 {
|
|
a = -a
|
|
}
|
|
if a > 1 {
|
|
a = 1
|
|
}
|
|
// This algorithm comes from the standard library's image/draw package.
|
|
dstA := uint32(dst[i]) * 0x101
|
|
maskA := uint32(almost65536 * a)
|
|
outA := dstA*(0xffff-maskA)/0xffff + maskA
|
|
dst[i] = uint8(outA >> 8)
|
|
}
|
|
}
|
|
|
|
func floatingAccumulateOpSrc(dst []uint8, src []float32) {
|
|
// Sanity check that len(dst) >= len(src).
|
|
if len(dst) < len(src) {
|
|
return
|
|
}
|
|
|
|
acc := float32(0)
|
|
for i, v := range src {
|
|
acc += v
|
|
a := acc
|
|
if a < 0 {
|
|
a = -a
|
|
}
|
|
if a > 1 {
|
|
a = 1
|
|
}
|
|
dst[i] = uint8(almost256 * a)
|
|
}
|
|
}
|
|
|
|
func floatingAccumulateMask(dst []uint32, src []float32) {
|
|
// Sanity check that len(dst) >= len(src).
|
|
if len(dst) < len(src) {
|
|
return
|
|
}
|
|
|
|
acc := float32(0)
|
|
for i, v := range src {
|
|
acc += v
|
|
a := acc
|
|
if a < 0 {
|
|
a = -a
|
|
}
|
|
if a > 1 {
|
|
a = 1
|
|
}
|
|
dst[i] = uint32(almost65536 * a)
|
|
}
|
|
}
|