| Index: src/opts/SkPMFloat_neon.h
|
| diff --git a/src/opts/SkPMFloat_neon.h b/src/opts/SkPMFloat_neon.h
|
| index baad190e563d066fdd01ed364a977573114d374f..1c01bc48038c6a22637ef18ced9b3ac793a19e08 100644
|
| --- a/src/opts/SkPMFloat_neon.h
|
| +++ b/src/opts/SkPMFloat_neon.h
|
| @@ -17,12 +17,12 @@ inline SkPMFloat::SkPMFloat(SkPMColor c) {
|
| uint8x8_t fix8 = (uint8x8_t)vdup_n_u32(c);
|
| uint16x8_t fix8_16 = vmovl_u8(fix8);
|
| uint32x4_t fix8_32 = vmovl_u16(vget_low_u16(fix8_16));
|
| - fColors = vcvtq_f32_u32(fix8_32);
|
| + fVec = vcvtq_f32_u32(fix8_32);
|
| SkASSERT(this->isValid());
|
| }
|
|
|
| inline SkPMColor SkPMFloat::trunc() const {
|
| - uint32x4_t fix8_32 = vcvtq_u32_f32(fColors.vec()); // vcvtq_u32_f32 truncates
|
| + uint32x4_t fix8_32 = vcvtq_u32_f32(fVec); // vcvtq_u32_f32 truncates
|
| uint16x4_t fix8_16 = vmovn_u32(fix8_32);
|
| uint8x8_t fix8 = vmovn_u16(vcombine_u16(fix8_16, vdup_n_u16(0)));
|
| SkPMColor c = vget_lane_u32((uint32x2_t)fix8, 0);
|
| @@ -35,7 +35,7 @@ inline SkPMColor SkPMFloat::round() const {
|
| }
|
|
|
| inline SkPMColor SkPMFloat::roundClamp() const {
|
| - float32x4_t add_half = vaddq_f32(fColors.vec(), vdupq_n_f32(0.5f));
|
| + float32x4_t add_half = vaddq_f32(fVec, vdupq_n_f32(0.5f));
|
| uint32x4_t fix8_32 = vcvtq_u32_f32(add_half); // vcvtq_u32_f32 truncates, so round manually
|
| uint16x4_t fix8_16 = vqmovn_u32(fix8_32);
|
| uint8x8_t fix8 = vqmovn_u16(vcombine_u16(fix8_16, vdup_n_u16(0)));
|
|
|