| Index: src/opts/SkBlitMask_opts_arm.cpp
|
| diff --git a/src/opts/SkBlitMask_opts_arm.cpp b/src/opts/SkBlitMask_opts_arm.cpp
|
| index 11e172c0d1d37c54cb4479141df41e336cd05526..e58be5c4a57b125b6a33c89a372740e924cb86b4 100644
|
| --- a/src/opts/SkBlitMask_opts_arm.cpp
|
| +++ b/src/opts/SkBlitMask_opts_arm.cpp
|
| @@ -11,32 +11,6 @@
|
| #include "SkUtilsArm.h"
|
| #include "SkBlitMask_opts_arm_neon.h"
|
|
|
| -SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkColorType dstCT,
|
| - SkMask::Format maskFormat,
|
| - SkColor color) {
|
| -#if SK_ARM_NEON_IS_NONE
|
| - return NULL;
|
| -#else
|
| -/* ** This has been disabled until we can diagnose and fix the SIGILL generated
|
| - ** in the NEON code. See http://skbug.com/2067 for details.
|
| -#if SK_ARM_NEON_IS_DYNAMIC
|
| - if (!sk_cpu_arm_has_neon()) {
|
| - return NULL;
|
| - }
|
| -#endif
|
| - if ((kN32_SkColorType == dstCT) &&
|
| - (SkMask::kA8_Format == maskFormat)) {
|
| - return D32_A8_Factory_neon(color);
|
| - }
|
| -*/
|
| -#endif
|
| -
|
| - // We don't need to handle the SkMask::kLCD16_Format case as the default
|
| - // LCD16 will call us through SkBlitMask::PlatformBlitRowProcs16()
|
| -
|
| - return NULL;
|
| -}
|
| -
|
| SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
|
| if (isOpaque) {
|
| return SK_ARM_NEON_WRAP(SkBlitLCD16OpaqueRow);
|
|
|