disable runtime detected AVX2 raster pipelines

It's proving too difficult to keep on top of all the ways we might cause ODR violations that crash Chrome.  I'd rather focus on other ways of running the pipelines that won't have that particular problem.  Our -Fast bots will keep testing and benchmarking AVX2 raster pipelines.

BUG=chromium:679147,chromium:654213,chromium:664864,chromium:666707,etc.

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD

Change-Id: I35ba8f5f4303107237fd78a6ce442d7c26e5fbef
Reviewed-on: https://skia-review.googlesource.com/6827
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

diff --git a/src/opts/SkOpts_hsw.cpp b/src/opts/SkOpts_hsw.cpp
index bb4e4d1..223495f 100644 (file)
--- a/src/opts/SkOpts_hsw.cpp
+++ b/src/opts/SkOpts_hsw.cpp
@@ -16,7 +16,6 @@
 #include "SkOpts.h"
 #define SK_OPTS_NS hsw
 #include "SkBitmapFilter_opts.h"
-#include "SkRasterPipeline_opts.h"
 
 #if defined(_INC_MATH) && !defined(INC_MATH_IS_SAFE_NOW)
     #error We have included ucrt\math.h without protecting it against ODR violation.
@@ -24,8 +23,6 @@
 
 namespace SkOpts {
     void Init_hsw() {
-        run_pipeline     = hsw::run_pipeline;
-        compile_pipeline = hsw::compile_pipeline;
         convolve_vertically = hsw::convolve_vertically;
     }
 }