Revert of skrpb: evaluate color filters for constant shaders once.

src/core/SkRasterPipelineBlitter.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 "SkBlitter.h"
 #include "SkBlendModePriv.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
 #include "SkOpts.h"
 #include "SkPM4f.h"
 #include "SkRasterPipeline.h"
 #include "SkShader.h"
 #include "SkXfermode.h"
 
 
 class SkRasterPipelineBlitter : public SkBlitter {
 public:
     static SkBlitter* Create(const SkPixmap&, const SkPaint&, SkTBlitterAllocator*);
 
-    SkRasterPipelineBlitter(SkPixmap dst, SkBlendMode blend, SkPM4f paintColor)
+    SkRasterPipelineBlitter(SkPixmap dst,
+                            SkRasterPipeline shader,
+                            SkBlendMode blend,
+                            SkPM4f paintColor)
         : fDst(dst)
+        , fShader(shader)
         , fBlend(blend)
         , fPaintColor(paintColor)
     {}
 
     void blitH    (int x, int y, int w)                            override;
     void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) override;
     void blitMask (const SkMask&, const SkIRect& clip)             override;
 
     // TODO: The default implementations of the other blits look fine,
     // but some of them like blitV could probably benefit from custom
     // blits using something like a SkRasterPipeline::runFew() method.
 
 private:
     void append_load_d(SkRasterPipeline*) const;
     void append_store (SkRasterPipeline*) const;
     void append_blend (SkRasterPipeline*) const;
     void maybe_clamp  (SkRasterPipeline*) const;
 
     SkPixmap         fDst;
+    SkRasterPipeline fShader;
     SkBlendMode      fBlend;
     SkPM4f           fPaintColor;
-    SkRasterPipeline fShader;
 
     // These functions are compiled lazily when first used.
     std::function<void(size_t, size_t)> fBlitH         = nullptr,
                                         fBlitAntiH     = nullptr,
                                         fBlitMaskA8    = nullptr,
                                         fBlitMaskLCD16 = nullptr;
 
     // These values are pointed to by the compiled blit functions
     // above, which allows us to adjust them from call to call.
     void*       fDstPtr           = nullptr;
@@ skipping 16 matching lines @@
         case kRGB_565_SkColorType:  return true;
         default:                    return false;
     }
 }
 
 template <typename Effect>
 static bool append_effect_stages(const Effect* effect, SkRasterPipeline* pipeline) {
     return !effect || effect->appendStages(pipeline);
 }
 
-static SkPM4f paint_color(const SkPixmap& dst, const SkPaint& paint) {
-    auto paintColor = paint.getColor();
-    SkColor4f color;
-    if (dst.info().colorSpace()) {
-        color = SkColor4f::FromColor(paintColor);
-        // TODO: transform from sRGB to dst gamut.
-    } else {
-        swizzle_rb(SkNx_cast<float>(Sk4b::Load(&paintColor)) * (1/255.0f)).store(&color);
-    }
-    return color.premul();
-}
 
 SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
                                            const SkPaint& paint,
                                            SkTBlitterAllocator* alloc) {
-    auto blitter = alloc->createT<SkRasterPipelineBlitter>(dst,
-                                                           paint.getBlendMode(),
-                                                           paint_color(dst, paint));
-    SkBlendMode*      blend      = &blitter->fBlend;
-    SkPM4f*           paintColor = &blitter->fPaintColor;
-    SkRasterPipeline* pipeline   = &blitter->fShader;
-
-    SkShader*      shader      = paint.getShader();
-    SkColorFilter* colorFilter = paint.getColorFilter();
-
-    // TODO: all temporary
-    if (!supported(dst.info()) || shader || !SkBlendMode_AppendStages(*blend)) {
-        alloc->freeLast();
+    if (!supported(dst.info())) {
         return nullptr;
     }
-
-    bool is_opaque, is_constant;
-    if (shader) {
-        is_opaque   = shader->isOpaque();
-        is_constant = false;  // TODO: shader->isConstant()
-        // TODO: append shader stages, of course!
-    } else {
-        is_opaque   = paintColor->a() == 1.0f;
-        is_constant = true;
-        pipeline->append(SkRasterPipeline::constant_color, paintColor);
+    if (paint.getShader()) {
+        return nullptr;  // TODO: need to work out how shaders and their contexts work
+    }
+    SkBlendMode blend = paint.getBlendMode();
+    if (!SkBlendMode_AppendStages(blend)) {
+        return nullptr;  // TODO
     }
 
-    if (colorFilter) {
-        if (!colorFilter->appendStages(pipeline, is_opaque)) {
-            alloc->freeLast();
+    uint32_t paintColor = paint.getColor();
+    bool shaderIsOpaque = (paintColor >> 24) == 0xff;
+
+    SkRasterPipeline shader, colorFilter;
+    if (auto s = paint.getShader()) {
+        shaderIsOpaque = s->isOpaque();
+    }
+    if (auto cf = paint.getColorFilter()) {
+        if (!cf->appendStages(&colorFilter, shaderIsOpaque)) {
             return nullptr;
         }
-        is_opaque = is_opaque && (colorFilter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag);
+        shaderIsOpaque = shaderIsOpaque && (cf->getFlags() & SkColorFilter::kAlphaUnchanged_Flag);
     }
 
-    if (is_constant) {
-        pipeline->append(SkRasterPipeline::store_f32, &paintColor);
-        pipeline->compile()(0,1);
-
-        *pipeline = SkRasterPipeline();
-        pipeline->append(SkRasterPipeline::constant_color, paintColor);
-
-        is_opaque = paintColor->a() == 1.0f;
+    if (shaderIsOpaque && blend == SkBlendMode::kSrcOver) {
+        blend = SkBlendMode::kSrc;
     }
 
-    if (is_opaque && *blend == SkBlendMode::kSrcOver) {
-        *blend = SkBlendMode::kSrc;
+    SkColor4f color;
+    if (dst.info().colorSpace()) {
+        color = SkColor4f::FromColor(paintColor);
+    } else {
+        swizzle_rb(SkNx_cast<float>(Sk4b::Load(&paintColor)) * (1/255.0f)).store(&color);
     }
 
+    auto blitter = alloc->createT<SkRasterPipelineBlitter>(dst, shader, blend, color.premul());
+
+    if (!paint.getShader()) {
+        blitter->fShader.append(SkRasterPipeline::constant_color, &blitter->fPaintColor);
+    }
+    blitter->fShader.extend(colorFilter);
+
     return blitter;
 }
 
 void SkRasterPipelineBlitter::append_load_d(SkRasterPipeline* p) const {
     SkASSERT(supported(fDst.info()));
 
     switch (fDst.info().colorType()) {
         case kN32_SkColorType:
             if (fDst.info().gammaCloseToSRGB()) {
                 p->append(SkRasterPipeline::load_d_srgb, &fDstPtr);
@@ skipping 128 matching lines @@
             case SkMask::kLCD16_Format:
                 fMaskPtr = mask.getAddrLCD16(x,y)-x;
                 fBlitMaskLCD16(x, clip.width());
                 break;
             default:
                 // TODO
                 break;
         }
     }
 }