1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/archive/0009-Bug-777614-Re-apply-759683-Handle-compilers-that-don.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,40 @@
1.4 +From 2c5a8cebc806ed287ce7c3723ea64a233266cd9e Mon Sep 17 00:00:00 2001
1.5 +From: George Wright <gw@gwright.org.uk>
1.6 +Date: Thu, 13 Sep 2012 14:55:33 -0400
1.7 +Subject: [PATCH 9/9] Bug 777614 - Re-apply 759683 - Handle compilers that
1.8 + don't support SSSE3 intrinsics r=nrc
1.9 +
1.10 +---
1.11 + gfx/skia/src/opts/opts_check_SSE2.cpp | 6 +++++-
1.12 + 1 file changed, 5 insertions(+), 1 deletion(-)
1.13 +
1.14 +diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp
1.15 +index 96d0dea..add6d5f 100644
1.16 +--- a/gfx/skia/src/opts/opts_check_SSE2.cpp
1.17 ++++ b/gfx/skia/src/opts/opts_check_SSE2.cpp
1.18 +@@ -86,9 +86,13 @@ static inline bool hasSSSE3() {
1.19 + #else
1.20 +
1.21 + static inline bool hasSSSE3() {
1.22 ++#if defined(SK_BUILD_SSSE3)
1.23 + int cpu_info[4] = { 0 };
1.24 + getcpuid(1, cpu_info);
1.25 + return (cpu_info[2] & 0x200) != 0;
1.26 ++#else
1.27 ++ return false;
1.28 ++#endif
1.29 + }
1.30 + #endif
1.31 +
1.32 +@@ -104,7 +108,7 @@ static bool cachedHasSSSE3() {
1.33 +
1.34 + void SkBitmapProcState::platformProcs() {
1.35 + if (cachedHasSSSE3()) {
1.36 +-#if !defined(SK_BUILD_FOR_ANDROID)
1.37 ++#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3)
1.38 + // Disable SSSE3 optimization for Android x86
1.39 + if (fSampleProc32 == S32_opaque_D32_filter_DX) {
1.40 + fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
1.41 +--
1.42 +1.7.11.4
1.43 +
