0009-Bug-777614-Re-apply-759683-Handle-compilers-that-don.patch (1253B)
1 From 2c5a8cebc806ed287ce7c3723ea64a233266cd9e Mon Sep 17 00:00:00 2001 2 From: George Wright <gw@gwright.org.uk> 3 Date: Thu, 13 Sep 2012 14:55:33 -0400 4 Subject: [PATCH 9/9] Bug 777614 - Re-apply 759683 - Handle compilers that 5 don't support SSSE3 intrinsics r=nrc 6 7 --- 8 gfx/skia/src/opts/opts_check_SSE2.cpp | 6 +++++- 9 1 file changed, 5 insertions(+), 1 deletion(-) 10 11 diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp 12 index 96d0dea..add6d5f 100644 13 --- a/gfx/skia/src/opts/opts_check_SSE2.cpp 14 +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp 15 @@ -86,9 +86,13 @@ static inline bool hasSSSE3() { 16 #else 17 18 static inline bool hasSSSE3() { 19 +#if defined(SK_BUILD_SSSE3) 20 int cpu_info[4] = { 0 }; 21 getcpuid(1, cpu_info); 22 return (cpu_info[2] & 0x200) != 0; 23 +#else 24 + return false; 25 +#endif 26 } 27 #endif 28 29 @@ -104,7 +108,7 @@ static bool cachedHasSSSE3() { 30 31 void SkBitmapProcState::platformProcs() { 32 if (cachedHasSSSE3()) { 33 -#if !defined(SK_BUILD_FOR_ANDROID) 34 +#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3) 35 // Disable SSSE3 optimization for Android x86 36 if (fSampleProc32 == S32_opaque_D32_filter_DX) { 37 fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; 38 -- 39 1.7.11.4