michael@0: From: George Wright michael@0: Date: Thu, 25 Apr 2013 20:49:45 -0400 michael@0: Subject: Bug 848491 - Re-apply 759683 - Handle compilers that don't support SSSE3 intrinsics michael@0: michael@0: michael@0: diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp michael@0: index 6370058..18f68d6 100644 michael@0: --- a/gfx/skia/src/opts/opts_check_SSE2.cpp michael@0: +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp michael@0: @@ -86,9 +86,13 @@ static inline bool hasSSSE3() { michael@0: #else michael@0: michael@0: static inline bool hasSSSE3() { michael@0: +#if defined(SK_BUILD_SSSE3) michael@0: int cpu_info[4] = { 0 }; michael@0: getcpuid(1, cpu_info); michael@0: return (cpu_info[2] & 0x200) != 0; michael@0: +#else michael@0: + return false; michael@0: +#endif michael@0: } michael@0: #endif michael@0: michael@0: @@ -104,7 +108,7 @@ static bool cachedHasSSSE3() { michael@0: michael@0: void SkBitmapProcState::platformProcs() { michael@0: if (cachedHasSSSE3()) { michael@0: -#if !defined(SK_BUILD_FOR_ANDROID) michael@0: +#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3) michael@0: // Disable SSSE3 optimization for Android x86 michael@0: if (fSampleProc32 == S32_opaque_D32_filter_DX) { michael@0: fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; michael@0: -- michael@0: 1.7.11.7 michael@0: