remove AVX raster pipeline stages

It's rare these days to find a CPU with AVX but not AVX2.

The memsets still make sense to leave, as we don't do anything
different there even with AVX2... all the instructions we want
are available with AVX.

Change-Id: I412f95c4548cfcc56c19b72348deceee83ba0610
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294319
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/src/opts/SkOpts_avx.cpp b/src/opts/SkOpts_avx.cpp
index 80ccf54..99d828f 100644
--- a/src/opts/SkOpts_avx.cpp
+++ b/src/opts/SkOpts_avx.cpp
@@ -8,7 +8,6 @@
 #include "src/core/SkOpts.h"
 
 #define SK_OPTS_NS avx
-#include "src/opts/SkRasterPipeline_opts.h"
 #include "src/opts/SkUtils_opts.h"
 
 namespace SkOpts {
@@ -20,17 +19,5 @@
         rect_memset16 = SK_OPTS_NS::rect_memset16;
         rect_memset32 = SK_OPTS_NS::rect_memset32;
         rect_memset64 = SK_OPTS_NS::rect_memset64;
-
-    #define M(st) stages_highp[SkRasterPipeline::st] = (StageFn)SK_OPTS_NS::st;
-        SK_RASTER_PIPELINE_STAGES(M)
-        just_return_highp = (StageFn)SK_OPTS_NS::just_return;
-        start_pipeline_highp = SK_OPTS_NS::start_pipeline;
-    #undef M
-
-    #define M(st) stages_lowp[SkRasterPipeline::st] = (StageFn)SK_OPTS_NS::lowp::st;
-        SK_RASTER_PIPELINE_STAGES(M)
-        just_return_lowp = (StageFn)SK_OPTS_NS::lowp::just_return;
-        start_pipeline_lowp = SK_OPTS_NS::lowp::start_pipeline;
-    #undef M
     }
 }