Revert r200891, "Added MIPS DSPr2 optimization for BGRAConvolve2D rou…

…tine." This reverts commit 7d4175c. TBR= Review URL: https://codereview.chromium.org/15352002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200898 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · May 17, 2013 · 794d350 · 794d350
1 parent f8c6cc8
commit 794d350
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 553 deletions.
diff --git a/skia/ext/convolver.cc b/skia/ext/convolver.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "skia/ext/convolver.h"
 #include "skia/ext/convolver_SSE2.h"
-#include "skia/ext/convolver_mips_dspr2.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
@@ -348,8 +347,7 @@ typedef void (*Convolve4RowsHorizontally_pointer)(
 typedef void (*ConvolveHorizontally_pointer)(
     const unsigned char* src_data,
     const ConvolutionFilter1D& filter,
-    unsigned char* out_row,
-    bool has_alpha);
+    unsigned char* out_row);
 
 struct ConvolveProcs {
   // This is how many extra pixels may be read by the
@@ -369,10 +367,6 @@ void SetupSIMD(ConvolveProcs *procs) {
     procs->convolve_4rows_horizontally = &Convolve4RowsHorizontally_SSE2;
     procs->convolve_horizontally = &ConvolveHorizontally_SSE2;
   }
-#elif defined SIMD_MIPS_DSPR2
-    procs->extra_horizontal_reads = 3;
-    procs->convolve_vertically = &ConvolveVertically_mips_dspr2;
-    procs->convolve_horizontally = &ConvolveHorizontally_mips_dspr2;
 #endif
 }
 
@@ -470,7 +464,7 @@ void BGRAConvolve2D(const unsigned char* source_data,
             avoid_simd_rows) {
           simd.convolve_horizontally(
               &source_data[next_x_row * source_byte_row_stride],
-              filter_x, row_buffer.AdvanceRow(), source_has_alpha);
+              filter_x, row_buffer.AdvanceRow());
         } else {
           if (source_has_alpha) {
             ConvolveHorizontally<true>(

diff --git a/skia/ext/convolver.h b/skia/ext/convolver.h
@@ -20,10 +20,6 @@
 #define SIMD_PADDING 8  // 8 * int16
 #endif
 
-#if defined (ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_MIPSEL) && \
-defined(__mips_dsp) && (__mips_dsp_rev >= 2)
-#define SIMD_MIPS_DSPR2 1
-#endif
 // avoid confusion with Mac OS X's math library (Carbon)
 #if defined(__APPLE__)
 #undef FloatToFixed

diff --git a/skia/ext/convolver_SSE2.cc b/skia/ext/convolver_SSE2.cc
@@ -16,8 +16,7 @@ namespace skia {
 // |src_data| and continues for the num_values() of the filter.
 void ConvolveHorizontally_SSE2(const unsigned char* src_data,
                                const ConvolutionFilter1D& filter,
-                               unsigned char* out_row,
-                               bool has_alpha) {
+                               unsigned char* out_row) {
   int num_values = filter.num_values();
 
   int filter_offset, filter_length;

diff --git a/skia/ext/convolver_SSE2.h b/skia/ext/convolver_SSE2.h
@@ -20,8 +20,7 @@ void Convolve4RowsHorizontally_SSE2(const unsigned char* src_data[4],
                                     unsigned char* out_row[4]);
 void ConvolveHorizontally_SSE2(const unsigned char* src_data,
                                const ConvolutionFilter1D& filter,
-                               unsigned char* out_row,
-                               bool has_alpha);
+                               unsigned char* out_row);
 }  // namespace skia
 
 #endif  // SKIA_EXT_CONVOLVER_SSE2_H_
diff --git a/skia/ext/convolver_mips_dspr2.cc b/skia/ext/convolver_mips_dspr2.cc
diff --git a/skia/ext/convolver_mips_dspr2.h b/skia/ext/convolver_mips_dspr2.h
diff --git a/skia/skia.gyp b/skia/skia.gyp
@@ -744,7 +744,6 @@
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
-            'ext/convolver_mips_dspr2.cc',
           ],
         }],
       ],
@@ -788,7 +787,7 @@
             ],
           },
         }],
-        [ 'target_arch != "arm" and target_arch !="mipsel"', {
+        [ 'target_arch != "arm"', {
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
           ],