diff options
Diffstat (limited to 'chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp')
| -rw-r--r-- | chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp b/chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp index 2bf760313c1..11e172c0d1d 100644 --- a/chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp +++ b/chromium/third_party/skia/src/opts/SkBlitMask_opts_arm.cpp @@ -1,3 +1,9 @@ +/* + * Copyright 2014 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkColor.h" #include "SkColorPriv.h" @@ -5,21 +11,24 @@ #include "SkUtilsArm.h" #include "SkBlitMask_opts_arm_neon.h" -SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig, +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 ((SkBitmap::kARGB_8888_Config == dstConfig) && + 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 @@ -36,7 +45,7 @@ SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) { } } -SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig, +SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType dstCT, SkMask::Format maskFormat, RowFlags flags) { return NULL; |