Add an enum layer of indirection for stock raster pipeline stages.

This is handy now, and becomes necessary with fancier backends:
   - most code can't speak the type of AVX pipeline stages,
     so indirection's definitely needed there;
   - if the pipleine is entirely composed of stock stages,
     these enum values become an abstract recipe that can be JITted.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2782
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot

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

1 files changed, 5 insertions, 5 deletions

diff --git a/bench/SkRasterPipelineBench.cpp b/bench/SkRasterPipelineBench.cpp
index 17a93da549..a5e53471cd 100644
--- a/bench/SkRasterPipelineBench.cpp
+++ b/bench/SkRasterPipelineBench.cpp
@@ -30,11 +30,11 @@ public:
     void onDraw(int loops, SkCanvas*) override {
         while (loops --> 0) {
             SkRasterPipeline p;
-            p.append(SkOpts::load_s_srgb_body, SkOpts::load_s_srgb_tail, src);
-            p.append(SkOpts::scale_u8_body,    SkOpts::scale_u8_tail,    mask);
-            p.append(SkOpts::load_d_srgb_body, SkOpts::load_d_srgb_tail, dst);
-            p.append(SkOpts::srcover);
-            p.append(SkOpts::store_srgb_body,  SkOpts::store_srgb_tail,  dst);
+            p.append(SkRasterPipeline::load_s_srgb, src);
+            p.append(SkRasterPipeline::   scale_u8, mask);
+            p.append(SkRasterPipeline::load_d_srgb, dst);
+            p.append(SkRasterPipeline::    srcover);
+            p.append(SkRasterPipeline:: store_srgb, dst);
             p.run(N);
         }
     }