0008-Bug-848491-Re-apply-759683-Handle-compilers-that-don.patch (1061B)
1 From: George Wright <gw@gwright.org.uk> 2 Date: Thu, 25 Apr 2013 20:49:45 -0400 3 Subject: Bug 848491 - Re-apply 759683 - Handle compilers that don't support SSSE3 intrinsics 4 5 6 diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp 7 index 6370058..18f68d6 100644 8 --- a/gfx/skia/src/opts/opts_check_SSE2.cpp 9 +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp 10 @@ -86,9 +86,13 @@ static inline bool hasSSSE3() { 11 #else 12 13 static inline bool hasSSSE3() { 14 +#if defined(SK_BUILD_SSSE3) 15 int cpu_info[4] = { 0 }; 16 getcpuid(1, cpu_info); 17 return (cpu_info[2] & 0x200) != 0; 18 +#else 19 + return false; 20 +#endif 21 } 22 #endif 23 24 @@ -104,7 +108,7 @@ static bool cachedHasSSSE3() { 25 26 void SkBitmapProcState::platformProcs() { 27 if (cachedHasSSSE3()) { 28 -#if !defined(SK_BUILD_FOR_ANDROID) 29 +#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3) 30 // Disable SSSE3 optimization for Android x86 31 if (fSampleProc32 == S32_opaque_D32_filter_DX) { 32 fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; 33 -- 34 1.7.11.7