Make PixelGetters much smaller, move more common code to PixelAccessor.

src/core/SkLinearBitmapPipeline.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkLinearBitmapPipeline.h"
 
 #include <algorithm>
@@ skipping 450 matching lines @@
         case SkShader::kMirror_TileMode:
             choose_tiler_ymode<XMirrorStrategy>(yMode, filterQuality, dimensions, next, tileStage);
             break;
     }
 
     return tileStage->get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Source Sampling Stage
-template <typename SourceStrategy, typename Next>
+template <SkColorType colorType, SkColorProfileType colorProfile, typename Next>
 class NearestNeighborSampler final : public SkLinearBitmapPipeline::SampleProcessorInterface {
 public:
     template <typename... Args>
     NearestNeighborSampler(Next* next, Args&&... args)
     : fSampler{next, std::forward<Args>(args)...} { }
 
     NearestNeighborSampler(Next* next, const NearestNeighborSampler& sampler)
         : fSampler{next, sampler.fSampler} { }
 
     void VECTORCALL pointListFew(int n, Sk4s xs, Sk4s ys) override {
@@ skipping 17 matching lines @@
 
     void VECTORCALL bilerpEdge(Sk4s xs, Sk4s ys) override {
         SkFAIL("Using nearest neighbor sampler, but calling a bilerpEdge.");
     }
 
     void bilerpSpan(Span span, SkScalar y) override {
         SkFAIL("Using nearest neighbor sampler, but calling a bilerpSpan.");
     }
 
 private:
-    GeneralSampler<SourceStrategy, Next> fSampler;
+    GeneralSampler<colorType, colorProfile, Next> fSampler;
 };
 
-template <typename SourceStrategy, typename Next>
+template <SkColorType colorType, SkColorProfileType colorProfile, typename Next>
 class BilerpSampler final : public SkLinearBitmapPipeline::SampleProcessorInterface {
 public:
     template <typename... Args>
     BilerpSampler(Next* next, Args&&... args)
         : fSampler{next, std::forward<Args>(args)...} { }
 
     BilerpSampler(Next* next, const BilerpSampler& sampler)
     : fSampler{next, sampler.fSampler} { }
 
     void VECTORCALL pointListFew(int n, Sk4s xs, Sk4s ys) override {
@@ skipping 17 matching lines @@
 
     void VECTORCALL bilerpEdge(Sk4s xs, Sk4s ys) override {
         fSampler.bilerpEdge(xs, ys);
     }
 
     void bilerpSpan(Span span, SkScalar y) override {
         fSampler.bilerpSpanWithY(span, y);
     }
 
 private:
-    GeneralSampler<SourceStrategy, Next> fSampler;
+    GeneralSampler<colorType, colorProfile, Next> fSampler;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Specialized Samplers
 
 // RGBA8888UnitRepeatSrc - A sampler that takes advantage of the fact the the src and destination
 // are the same format and do not need in transformations in pixel space. Therefore, there is no
 // need to convert them to HiFi pixel format.
 class RGBA8888UnitRepeatSrc final : public SkLinearBitmapPipeline::SampleProcessorInterface,
                                     public SkLinearBitmapPipeline::DestinationInterface {
@@ skipping 140 matching lines @@
     };
 
     const uint32_t* const fSrc;
     const int32_t         fWidth;
     uint32_t*             fDest;
     uint32_t*             fEnd;
 };
 
 using Blender = SkLinearBitmapPipeline::BlendProcessorInterface;
 
-template<template <typename, typename> class Sampler>
+template<template <SkColorType, SkColorProfileType, typename> class Sampler>
 static SkLinearBitmapPipeline::SampleProcessorInterface* choose_pixel_sampler_base(
     Blender* next,
     const SkPixmap& srcPixmap,
     SkLinearBitmapPipeline::SampleStage* sampleStage) {
     const SkImageInfo& imageInfo = srcPixmap.info();
     switch (imageInfo.colorType()) {
         case kRGBA_8888_SkColorType:
             if (imageInfo.profileType() == kSRGB_SkColorProfileType) {
-                sampleStage->initStage<Sampler<Pixel8888SRGB, Blender>>(next, srcPixmap);
+                using S = Sampler<kRGBA_8888_SkColorType, kSRGB_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             } else {
-                sampleStage->initStage<Sampler<Pixel8888LRGB, Blender>>(next, srcPixmap);
+                using S = Sampler<kRGBA_8888_SkColorType, kLinear_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             }
             break;
         case kBGRA_8888_SkColorType:
             if (imageInfo.profileType() == kSRGB_SkColorProfileType) {
-                sampleStage->initStage<Sampler<Pixel8888SBGR, Blender>>(next, srcPixmap);
+                using S = Sampler<kBGRA_8888_SkColorType, kSRGB_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             } else {
-                sampleStage->initStage<Sampler<Pixel8888LBGR, Blender>>(next, srcPixmap);
+                using S = Sampler<kBGRA_8888_SkColorType, kLinear_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             }
             break;
         case kIndex_8_SkColorType:
             if (imageInfo.profileType() == kSRGB_SkColorProfileType) {
-                sampleStage->initStage<Sampler<PixelIndex8SRGB, Blender>>(next, srcPixmap);
+                using S = Sampler<kIndex_8_SkColorType, kSRGB_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             } else {
-                sampleStage->initStage<Sampler<PixelIndex8LRGB, Blender>>(next, srcPixmap);
+                using S = Sampler<kIndex_8_SkColorType, kLinear_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
             }
             break;
-        case kRGBA_F16_SkColorType:
-            sampleStage->initStage<Sampler<PixelHalfLinear, Blender>>(next, srcPixmap);
+        case kRGBA_F16_SkColorType: {
+                using S = Sampler<kRGBA_F16_SkColorType, kLinear_SkColorProfileType, Blender>;
+                sampleStage->initStage<S>(next, srcPixmap);
+            }
             break;
         default:
             SkFAIL("Not implemented. Unsupported src");
             break;
     }
     return sampleStage->get();
 }
 
 SkLinearBitmapPipeline::SampleProcessorInterface* choose_pixel_sampler(
     Blender* next,
@@ skipping 185 matching lines @@
 void SkLinearBitmapPipeline::blitSpan(int x, int y, void* dst, int count) {
     SkASSERT(count > 0);
     fLastStage->setDestination(dst, count);
 
     // The count and length arguments start out in a precise relation in order to keep the
     // math correct through the different stages. Count is the number of pixel to produce.
     // Since the code samples at pixel centers, length is the distance from the center of the
     // first pixel to the center of the last pixel. This implies that length is count-1.
     fFirstStage->pointSpan(Span{{x + 0.5f, y + 0.5f}, count - 1.0f, count});
 }