Permalink
Browse files

Don't use S32A_D565_Opaque_arm, it causes FC's

  • Loading branch information...
1 parent 1332823 commit 8686ba6eae0124c95a7ca05b232531fa260c9df7 @birdiebnl committed Nov 10, 2011
Showing with 9 additions and 3 deletions.
  1. +7 −1 Android.mk
  2. +2 −2 src/core/SkBlitRow_D16.cpp
View
@@ -218,9 +218,15 @@ LOCAL_SRC_FILES += \
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -D__CPU_ARCH_ARM
LOCAL_SRC_FILES += \
- src/opts/S32A_D565_Opaque_arm.S \
src/opts/S32A_Opaque_BlitRow32_arm.S \
src/opts/S32A_Blend_BlitRow32_arm.S
+
+ifeq ($(TARGET_BOARD_PLATFORM),rk2818)
+ LOCAL_CFLAGS += -DNO_S32A_D565_OPAQUE_ARM
+else
+ LOCAL_SRC_FILES += \
+ src/opts/S32A_D565_Opaque_arm.S
+endif
endif
ifeq "$(findstring armv5te-vfp,$(TARGET_ARCH_VARIANT))" "armv5te-vfp"
@@ -204,7 +204,7 @@ static void S32A_D565_Blend_Dither(uint16_t* SK_RESTRICT dst,
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-#if defined(__CPU_ARCH_ARM) && defined(SK_CPU_LENDIAN)
+#if defined(__CPU_ARCH_ARM) && defined(SK_CPU_LENDIAN) && !defined(NO_S32A_D565_OPAQUE_ARM)
extern "C" void S32A_D565_Opaque_arm(uint16_t*, uint32_t*, size_t);
#endif
@@ -213,7 +213,7 @@ static const SkBlitRow::Proc gDefault_565_Procs[] = {
S32_D565_Opaque,
S32_D565_Blend,
-#if defined(__CPU_ARCH_ARM) && defined(SK_CPU_LENDIAN)
+#if defined(__CPU_ARCH_ARM) && defined(SK_CPU_LENDIAN) && !defined(NO_S32A_D565_OPAQUE_ARM)
(SkBlitRow::Proc)S32A_D565_Opaque_arm,
#else
S32A_D565_Opaque,

0 comments on commit 8686ba6

Please sign in to comment.