commit c857956fad09685a4ccb4ef410bce9edcbfc94cb
author Mike Klein <mtklein@google.com> Tue Aug 07 13:21:21 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 08 00:27:53 2018 +0000
tree 7453b442e4c14eddae4d6620c93059fd0f1ac70a
parent 30a4e3da4bf341d5968b8cdf5bc2260e7f0d4b04

transform colors with steps + raster pipeline in SkColorSpaceXformer

I hate SkColorSpaceXform,
and we think this is going to be faster, especially for single colors.

Add this mode of operation to our bench from yesterday.
No surprise, it's exactly as fast as pipeA.

This may DO the TODO?

Change-Id: I1b42b42d7647d85b62cd8397bb8d6f39c4829bcf
Reviewed-on: https://skia-review.googlesource.com/145823
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkColorSpaceXformer.cpp

diff --git a/src/core/SkColorSpaceXformer.cpp b/src/core/SkColorSpaceXformer.cpp
index 1e56d4d..e2a45f5 100644
--- a/src/core/SkColorSpaceXformer.cpp
+++ b/src/core/SkColorSpaceXformer.cpp
@@ -17,15 +17,31 @@
 #include "SkImagePriv.h"
 #include "SkShaderBase.h"
 
-SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst,
-                                         std::unique_ptr<SkColorSpaceXform> fromSRGB)
-    : fDst(std::move(dst))
-    , fFromSRGB(std::move(fromSRGB))
-    , fReentryCount(0) {}
+#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
+    SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst,
+                                             std::unique_ptr<SkColorSpaceXform> fromSRGB)
+        : fDst(std::move(dst))
+        , fFromSRGB(std::move(fromSRGB))
+        , fReentryCount(0) {}
+#else
+    SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst)
+        : fDst(std::move(dst))
+        , fFromSRGBSteps(SkColorSpaceXformSteps::UnpremulToUnpremul(sk_srgb_singleton(),
+                                                                    fDst.get()))
+        , fReentryCount(0) {
+
+        SkRasterPipeline p(&fAlloc);
+        p.append(SkRasterPipeline::load_bgra, &fFromSRGBSrc);
+        fFromSRGBSteps.apply(&p);
+        p.append(SkRasterPipeline::store_bgra, &fFromSRGBDst);
+        fFromSRGB = p.compile();
+    }
+#endif
 
 SkColorSpaceXformer::~SkColorSpaceXformer() {}
 
 std::unique_ptr<SkColorSpaceXformer> SkColorSpaceXformer::Make(sk_sp<SkColorSpace> dst) {
+#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
     std::unique_ptr<SkColorSpaceXform> fromSRGB = SkMakeColorSpaceXform(
             sk_srgb_singleton(), dst.get());
 
@@ -33,6 +49,9 @@
         ? std::unique_ptr<SkColorSpaceXformer>(new SkColorSpaceXformer(std::move(dst),
                                                                        std::move(fromSRGB)))
         : nullptr;
+#else
+    return std::unique_ptr<SkColorSpaceXformer>(new SkColorSpaceXformer{std::move(dst)});
+#endif
 }
 
 // So what's up with these caches?
@@ -138,9 +157,15 @@
 }
 
 void SkColorSpaceXformer::apply(SkColor* xformed, const SkColor* srgb, int n) {
+#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
     SkAssertResult(fFromSRGB->apply(SkColorSpaceXform::kBGRA_8888_ColorFormat, xformed,
                                     SkColorSpaceXform::kBGRA_8888_ColorFormat, srgb,
                                     n, kUnpremul_SkAlphaType));
+#else
+    fFromSRGBSrc.pixels = const_cast<SkColor*>(srgb);
+    fFromSRGBDst.pixels = xformed;
+    fFromSRGB(0,0,n,1);
+#endif
 }
 
 SkColor SkColorSpaceXformer::apply(SkColor srgb) {