Revert of Properly enable S32_D16_filter_DX_SSE2 optimization.

src/opts/opts_check_SSE2.cpp

 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcState_opts_SSE2.h"
 #include "SkBitmapProcState_opts_SSSE3.h"
 #include "SkBitmapFilter_opts_SSE2.h"
@@ skipping 105 matching lines @@
     if (cachedHasSSE2()) {
         procs->fExtraHorizontalReads = 3;
         procs->fConvolveVertically = &convolveVertically_SSE2;
         procs->fConvolve4RowsHorizontally = &convolve4RowsHorizontally_SSE2;
         procs->fConvolveHorizontally = &convolveHorizontally_SSE2;
         procs->fApplySIMDPadding = &applySIMDPadding_SSE2;
     }
 }
 
 void SkBitmapProcState::platformProcs() {
-    /* Every optimization in the function requires at least SSE2 */
-    if (!cachedHasSSE2()) {
-        return;
-    }
+    if (cachedHasSSSE3()) {
+        if (fSampleProc32 == S32_opaque_D32_filter_DX) {
+            fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
+        } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
+            fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3;
+        }
 
-    /* Check fSampleProc32 */
-    if (fSampleProc32 == S32_opaque_D32_filter_DX) {
-        if (cachedHasSSSE3()) {
-            fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
-        } else {
+        if (fSampleProc32 == S32_opaque_D32_filter_DXDY) {
+            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_opaque_D32_filter_DXDY) {
-        if (cachedHasSSSE3()) {
-            fSampleProc32 = S32_opaque_D32_filter_DXDY_SSSE3;
-        }
-    } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
-        if (cachedHasSSSE3()) {
-            fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3;
-        } else {
+        } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
             fSampleProc32 = S32_alpha_D32_filter_DX_SSE2;
         }
-    } else if (fSampleProc32 == S32_alpha_D32_filter_DXDY) {
-        if (cachedHasSSSE3()) {
-            fSampleProc32 = S32_alpha_D32_filter_DXDY_SSSE3;
+
+        if (fSampleProc16 == S32_D16_filter_DX) {
+            fSampleProc16 = S32_D16_filter_DX_SSE2;
         }
     }
 
-    /* Check fSampleProc16 */
-    if (fSampleProc16 == S32_D16_filter_DX) {
-        fSampleProc16 = S32_D16_filter_DX_SSE2;
-    }
+    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 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;
+        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;
+            }
         }
     }
 }
 
 static SkBlitRow::Proc platform_16_procs[] = {
     S32_D565_Opaque_SSE2,               // S32_D565_Opaque
     NULL,                               // S32_D565_Blend
     S32A_D565_Opaque_SSE2,              // S32A_D565_Opaque
     NULL,                               // S32A_D565_Blend
     S32_D565_Opaque_Dither_SSE2,        // S32_D565_Opaque_Dither
@@ skipping 155 matching lines @@
     } else {
         return SkPlatformXfermodeFactory_impl(rec, mode);
     }
 }
 
 SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode);
 
 SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode) {
     return NULL;
 }