commit 980e2790ddd2268ec4a6c958b98dda829f737dd9
author Mike Reed <reed@google.com> Wed Jun 21 13:15:58 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 22 01:56:30 2017 +0000
tree 40ce7d977ad2b3b109a955600814e74e294c9549
parent 832bd2b69704391d2477a891e873a36b1763c740

Revert[2] "use rasterpipeline for non-8888-clamp shaders (so we can delete more legacy code)""

Now with guard for Chrome and fix for bench
https://codereview.chromium.org/2947233002/

This reverts commit 19d0b99922712df3f07ba4622f1e5ccddc3b7168.

Bug: skia:
Change-Id: I5991955d0d927d34a184cf4d9844b0d565e03b88
Reviewed-on: https://skia-review.googlesource.com/20461
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

bench/SkLinearBitmapPipelineBench.cpp

diff --git a/bench/SkLinearBitmapPipelineBench.cpp b/bench/SkLinearBitmapPipelineBench.cpp
index bbacac7..f8919bf 100644
--- a/bench/SkLinearBitmapPipelineBench.cpp
+++ b/bench/SkLinearBitmapPipelineBench.cpp
@@ -195,6 +195,9 @@
     }
 
     void onDraw(int loops, SkCanvas*) override {
+        if (as_SB(fPaint.getShader())->isRasterPipelineOnly()) {
+            return;
+        }
         int width = fSrcSize.fWidth;
         int height = fSrcSize.fHeight;
 

src/shaders/SkColorFilterShader.h

diff --git a/src/shaders/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h
index 6a3f65e..662c267 100644
--- a/src/shaders/SkColorFilterShader.h
+++ b/src/shaders/SkColorFilterShader.h
@@ -51,6 +51,9 @@
     sk_sp<SkShader> onMakeColorSpace(SkColorSpaceXformer* xformer) const override;
     bool onAppendStages(SkRasterPipeline*, SkColorSpace* dstCS, SkArenaAlloc*,
                         const SkMatrix&, const SkPaint&, const SkMatrix* localM) const override;
+    bool isRasterPipelineOnly() const override {
+        return as_SB(fShader)->isRasterPipelineOnly();
+    }
 
 private:
     sk_sp<SkShader>      fShader;

src/shaders/SkImageShader.cpp

diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 808b856..6d1adb7 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -48,6 +48,24 @@
     return fImage->isOpaque();
 }
 
+bool SkImageShader::IsRasterPipelineOnly(SkColorType ct, SkShader::TileMode tx,
+                                         SkShader::TileMode ty) {
+#ifndef SK_SUPPORT_LEGACY_TILED_BITMAPS
+    if (ct != kN32_SkColorType) {
+        return true;
+    }
+    if (tx != SkShader::kClamp_TileMode || ty != SkShader::kClamp_TileMode) {
+        return true;
+    }
+#endif
+    return false;
+}
+
+bool SkImageShader::isRasterPipelineOnly() const {
+    SkBitmapProvider provider(fImage.get(), nullptr);
+    return IsRasterPipelineOnly(provider.info().colorType(), fTileModeX, fTileModeY);
+}
+
 SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec,
                                                     SkArenaAlloc* alloc) const {
     return SkBitmapProcLegacyShader::MakeContext(*this, fTileModeX, fTileModeY,

src/shaders/SkImageShader.h

diff --git a/src/shaders/SkImageShader.h b/src/shaders/SkImageShader.h
index 7be982c..e68abb5 100644
--- a/src/shaders/SkImageShader.h
+++ b/src/shaders/SkImageShader.h
@@ -19,6 +19,7 @@
                                 const SkMatrix* localMatrix);
 
     bool isOpaque() const override;
+    bool isRasterPipelineOnly() const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader)
@@ -29,6 +30,8 @@
 
     SkImageShader(sk_sp<SkImage>, TileMode tx, TileMode ty, const SkMatrix* localMatrix);
 
+    static bool IsRasterPipelineOnly(SkColorType, SkShader::TileMode tx, SkShader::TileMode ty);
+
 protected:
     void flatten(SkWriteBuffer&) const override;
     Context* onMakeContext(const ContextRec&, SkArenaAlloc* storage) const override;

src/shaders/SkPictureShader.cpp

diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index 4bef53d..d80a7da 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -265,6 +265,10 @@
     return tileShader;
 }
 
+bool SkPictureShader::isRasterPipelineOnly() const {
+    return SkImageShader::IsRasterPipelineOnly(kN32_SkColorType, fTmx, fTmy);
+}
+
 bool SkPictureShader::onAppendStages(SkRasterPipeline* p, SkColorSpace* cs, SkArenaAlloc* alloc,
                                      const SkMatrix& ctm, const SkPaint& paint,
                                      const SkMatrix* localMatrix) const {

src/shaders/SkPictureShader.h

diff --git a/src/shaders/SkPictureShader.h b/src/shaders/SkPictureShader.h
index f7a509f..6fd2a3a 100644
--- a/src/shaders/SkPictureShader.h
+++ b/src/shaders/SkPictureShader.h
@@ -39,6 +39,7 @@
                         const SkMatrix&, const SkPaint&, const SkMatrix*) const override;
     Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override;
     sk_sp<SkShader> onMakeColorSpace(SkColorSpaceXformer* xformer) const override;
+    bool isRasterPipelineOnly() const override;
 
 private:
     SkPictureShader(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*,