1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/archive/0006-Bug-751814-ARM-EDSP-ARMv6-Skia-fixes.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,147 @@
1.4 +From 94916fbbc7865c6fe23a57d6edc48c6daf93dda8 Mon Sep 17 00:00:00 2001
1.5 +From: George Wright <gwright@mozilla.com>
1.6 +Date: Fri, 18 May 2012 14:16:08 -0400
1.7 +Subject: [PATCH 06/10] Bug 755869 - [9] Re-apply bug 751814 - Various
1.8 + Skia fixes for ARM without EDSP and ARMv6+
1.9 + r=mattwoodrow
1.10 +
1.11 +---
1.12 + gfx/skia/include/core/SkMath.h | 5 +--
1.13 + gfx/skia/include/core/SkPostConfig.h | 45 ++++++++++++++++++++++
1.14 + gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp | 6 +-
1.15 + gfx/skia/src/opts/SkBlitRow_opts_arm.cpp | 9 ++++
1.16 + 4 files changed, 58 insertions(+), 7 deletions(-)
1.17 +
1.18 +diff --git a/gfx/skia/include/core/SkMath.h b/gfx/skia/include/core/SkMath.h
1.19 +index 5889103..7a4b707 100644
1.20 +--- a/gfx/skia/include/core/SkMath.h
1.21 ++++ b/gfx/skia/include/core/SkMath.h
1.22 +@@ -153,10 +153,7 @@ static inline bool SkIsPow2(int value) {
1.23 + With this requirement, we can generate faster instructions on some
1.24 + architectures.
1.25 + */
1.26 +-#if defined(__arm__) \
1.27 +- && !defined(__thumb__) \
1.28 +- && !defined(__ARM_ARCH_4T__) \
1.29 +- && !defined(__ARM_ARCH_5T__)
1.30 ++#ifdef SK_ARM_HAS_EDSP
1.31 + static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
1.32 + SkASSERT((int16_t)x == x);
1.33 + SkASSERT((int16_t)y == y);
1.34 +diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
1.35 +index 041fe2a..03105e4 100644
1.36 +--- a/gfx/skia/include/core/SkPostConfig.h
1.37 ++++ b/gfx/skia/include/core/SkPostConfig.h
1.38 +@@ -311,3 +311,48 @@
1.39 + #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
1.40 + #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1
1.41 + #endif
1.42 ++
1.43 ++//////////////////////////////////////////////////////////////////////
1.44 ++// ARM defines
1.45 ++
1.46 ++#if defined(__GNUC__) && defined(__arm__)
1.47 ++
1.48 ++# define SK_ARM_ARCH 3
1.49 ++
1.50 ++# if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) \
1.51 ++ || defined(_ARM_ARCH_4)
1.52 ++# undef SK_ARM_ARCH
1.53 ++# define SK_ARM_ARCH 4
1.54 ++# endif
1.55 ++
1.56 ++# if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
1.57 ++ || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
1.58 ++ || defined(__ARM_ARCH_5TEJ__) || defined(_ARM_ARCH_5)
1.59 ++# undef SK_ARM_ARCH
1.60 ++# define SK_ARM_ARCH 5
1.61 ++# endif
1.62 ++
1.63 ++# if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
1.64 ++ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
1.65 ++ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
1.66 ++ || defined(__ARM_ARCH_6M__) || defined(_ARM_ARCH_6)
1.67 ++# undef SK_ARM_ARCH
1.68 ++# define SK_ARM_ARCH 6
1.69 ++# endif
1.70 ++
1.71 ++# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
1.72 ++ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
1.73 ++ || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7)
1.74 ++# undef SK_ARM_ARCH
1.75 ++# define SK_ARM_ARCH 7
1.76 ++# endif
1.77 ++
1.78 ++# undef SK_ARM_HAS_EDSP
1.79 ++# if defined(__thumb2__) && (SK_ARM_ARCH >= 6) \
1.80 ++ || !defined(__thumb__) \
1.81 ++ && ((SK_ARM_ARCH > 5) || defined(__ARM_ARCH_5E__) \
1.82 ++ || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__))
1.83 ++# define SK_ARM_HAS_EDSP 1
1.84 ++# endif
1.85 ++
1.86 ++#endif
1.87 +diff --git a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
1.88 +index 20d62e1..deb1bfe 100644
1.89 +--- a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
1.90 ++++ b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
1.91 +@@ -11,7 +11,7 @@
1.92 + #include "SkColorPriv.h"
1.93 + #include "SkUtils.h"
1.94 +
1.95 +-#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
1.96 ++#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
1.97 + void SI8_D16_nofilter_DX_arm(
1.98 + const SkBitmapProcState& s,
1.99 + const uint32_t* SK_RESTRICT xy,
1.100 +@@ -182,7 +182,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s,
1.101 +
1.102 + s.fBitmap->getColorTable()->unlockColors(false);
1.103 + }
1.104 +-#endif //__ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
1.105 ++#endif // SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
1.106 +
1.107 + ///////////////////////////////////////////////////////////////////////////////
1.108 +
1.109 +@@ -200,7 +200,7 @@ void SkBitmapProcState::platformProcs() {
1.110 +
1.111 + switch (fBitmap->config()) {
1.112 + case SkBitmap::kIndex8_Config:
1.113 +-#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
1.114 ++#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
1.115 + if (justDx && !doFilter) {
1.116 + #if 0 /* crashing on android device */
1.117 + fSampleProc16 = SI8_D16_nofilter_DX_arm;
1.118 +diff --git a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
1.119 +index 2490371..c928888 100644
1.120 +--- a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
1.121 ++++ b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
1.122 +@@ -675,8 +675,13 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_
1.123 + /* dst1_scale and dst2_scale*/
1.124 + "lsr r9, r5, #24 \n\t" /* src >> 24 */
1.125 + "lsr r10, r6, #24 \n\t" /* src >> 24 */
1.126 ++#ifdef SK_ARM_HAS_EDSP
1.127 + "smulbb r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
1.128 + "smulbb r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
1.129 ++#else
1.130 ++ "mul r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
1.131 ++ "mul r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
1.132 ++#endif
1.133 + "lsr r9, r9, #8 \n\t" /* r9 >> 8 */
1.134 + "lsr r10, r10, #8 \n\t" /* r10 >> 8 */
1.135 + "rsb r9, r9, #256 \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
1.136 +@@ -745,7 +750,11 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_
1.137 +
1.138 + "lsr r6, r5, #24 \n\t" /* src >> 24 */
1.139 + "and r8, r12, r5, lsr #8 \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
1.140 ++#ifdef SK_ARM_HAS_EDSP
1.141 + "smulbb r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
1.142 ++#else
1.143 ++ "mul r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
1.144 ++#endif
1.145 + "and r9, r12, r5 \n\t" /* rb = r9 = r5 masked by r12 */
1.146 + "lsr r6, r6, #8 \n\t" /* r6 >> 8 */
1.147 + "mul r8, r8, %[alpha] \n\t" /* ag = r8 times scale */
1.148 +--
1.149 +1.7.5.4
1.150 +
