1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/0008-Bug-848491-Re-apply-759683-Handle-compilers-that-don.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,35 @@
1.4 +From: George Wright <gw@gwright.org.uk>
1.5 +Date: Thu, 25 Apr 2013 20:49:45 -0400
1.6 +Subject: Bug 848491 - Re-apply 759683 - Handle compilers that don't support SSSE3 intrinsics
1.7 +
1.8 +
1.9 +diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp
1.10 +index 6370058..18f68d6 100644
1.11 +--- a/gfx/skia/src/opts/opts_check_SSE2.cpp
1.12 ++++ b/gfx/skia/src/opts/opts_check_SSE2.cpp
1.13 +@@ -86,9 +86,13 @@ static inline bool hasSSSE3() {
1.14 + #else
1.15 +
1.16 + static inline bool hasSSSE3() {
1.17 ++#if defined(SK_BUILD_SSSE3)
1.18 + int cpu_info[4] = { 0 };
1.19 + getcpuid(1, cpu_info);
1.20 + return (cpu_info[2] & 0x200) != 0;
1.21 ++#else
1.22 ++ return false;
1.23 ++#endif
1.24 + }
1.25 + #endif
1.26 +
1.27 +@@ -104,7 +108,7 @@ static bool cachedHasSSSE3() {
1.28 +
1.29 + void SkBitmapProcState::platformProcs() {
1.30 + if (cachedHasSSSE3()) {
1.31 +-#if !defined(SK_BUILD_FOR_ANDROID)
1.32 ++#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3)
1.33 + // Disable SSSE3 optimization for Android x86
1.34 + if (fSampleProc32 == S32_opaque_D32_filter_DX) {
1.35 + fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
1.36 +--
1.37 +1.7.11.7
1.38 +
