diff options
Diffstat (limited to 'opts/opts_check_SSE2.cpp')
-rw-r--r-- | opts/opts_check_SSE2.cpp | 78 |
1 files changed, 48 insertions, 30 deletions
diff --git a/opts/opts_check_SSE2.cpp b/opts/opts_check_SSE2.cpp index e7677220..6c684c27 100644 --- a/opts/opts_check_SSE2.cpp +++ b/opts/opts_check_SSE2.cpp @@ -91,6 +91,16 @@ static inline bool hasSSE2() { static inline bool hasSSSE3() { return true; } +#elif defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) +/* For the Android framework we should always know at compile time if the device + * we are building for supports SSSE3. The one exception to this rule is on the + * emulator where we are compiled without the -msse3 option (so we have no SSSE3 + * procs) but can be run on a host machine that supports SSSE3 instructions. So + * for that particular case we disable our SSSE3 options. + */ +static inline bool hasSSSE3() { + return false; +} #else static inline bool hasSSSE3() { @@ -123,46 +133,54 @@ void SkBitmapProcState::platformConvolutionProcs(SkConvolutionProcs* procs) { } void SkBitmapProcState::platformProcs() { - if (cachedHasSSSE3()) { - if (fSampleProc32 == S32_opaque_D32_filter_DX) { + /* Every optimization in the function requires at least SSE2 */ + if (!cachedHasSSE2()) { + return; + } + + /* Check fSampleProc32 */ + if (fSampleProc32 == S32_opaque_D32_filter_DX) { + if (cachedHasSSSE3()) { fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; - } else if (fSampleProc32 == S32_alpha_D32_filter_DX) { - fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3; + } else { + fSampleProc32 = S32_opaque_D32_filter_DX_SSE2; } - - if (fSampleProc32 == S32_opaque_D32_filter_DXDY) { + } else if (fSampleProc32 == S32_opaque_D32_filter_DXDY) { + if (cachedHasSSSE3()) { fSampleProc32 = S32_opaque_D32_filter_DXDY_SSSE3; - } else if (fSampleProc32 == S32_alpha_D32_filter_DXDY) { - fSampleProc32 = S32_alpha_D32_filter_DXDY_SSSE3; } - } else if (cachedHasSSE2()) { - if (fSampleProc32 == S32_opaque_D32_filter_DX) { - fSampleProc32 = S32_opaque_D32_filter_DX_SSE2; - } else if (fSampleProc32 == S32_alpha_D32_filter_DX) { + } else if (fSampleProc32 == S32_alpha_D32_filter_DX) { + if (cachedHasSSSE3()) { + fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3; + } else { fSampleProc32 = S32_alpha_D32_filter_DX_SSE2; } - - if (fSampleProc16 == S32_D16_filter_DX) { - fSampleProc16 = S32_D16_filter_DX_SSE2; + } else if (fSampleProc32 == S32_alpha_D32_filter_DXDY) { + if (cachedHasSSSE3()) { + fSampleProc32 = S32_alpha_D32_filter_DXDY_SSSE3; } } - if (cachedHasSSSE3() || cachedHasSSE2()) { - if (fMatrixProc == ClampX_ClampY_filter_scale) { - fMatrixProc = ClampX_ClampY_filter_scale_SSE2; - } else if (fMatrixProc == ClampX_ClampY_nofilter_scale) { - fMatrixProc = ClampX_ClampY_nofilter_scale_SSE2; - } + /* Check fSampleProc16 */ + if (fSampleProc16 == S32_D16_filter_DX) { + fSampleProc16 = S32_D16_filter_DX_SSE2; + } - if (fMatrixProc == ClampX_ClampY_filter_affine) { - fMatrixProc = ClampX_ClampY_filter_affine_SSE2; - } else if (fMatrixProc == ClampX_ClampY_nofilter_affine) { - fMatrixProc = ClampX_ClampY_nofilter_affine_SSE2; - } - if (c_hqfilter_sse) { - if (fShaderProc32 == highQualityFilter32) { - fShaderProc32 = highQualityFilter_SSE2; - } + /* Check fMatrixProc */ + if (fMatrixProc == ClampX_ClampY_filter_scale) { + fMatrixProc = ClampX_ClampY_filter_scale_SSE2; + } else if (fMatrixProc == ClampX_ClampY_nofilter_scale) { + fMatrixProc = ClampX_ClampY_nofilter_scale_SSE2; + } else if (fMatrixProc == ClampX_ClampY_filter_affine) { + fMatrixProc = ClampX_ClampY_filter_affine_SSE2; + } else if (fMatrixProc == ClampX_ClampY_nofilter_affine) { + fMatrixProc = ClampX_ClampY_nofilter_affine_SSE2; + } + + /* Check fShaderProc32 */ + if (c_hqfilter_sse) { + if (fShaderProc32 == highQualityFilter32) { + fShaderProc32 = highQualityFilter_SSE2; } } } |