commit f489886915034093278353d06c6f1973b2e8b7d2
author Matt Sarett <msarett@google.com> Sun Oct 16 10:20:41 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Oct 16 14:51:57 2016 +0000
tree 284181b7f901cd0ac47ed0e52df17cc64a86fb49
parent 24a865c2c048faa615fcdde3b209a9c10a9be923

Cache dst LUTs in SkColorSpaceXform

This is only useful in the rare case that the dst does not
fall into one of our main paths.

But it's a good optimization, since this does happen,
and typically, the dst won't change.

ColorCodecBench z620 --nonstd --xform_only
Without Patch 511us
With Patch    348us

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3400

Change-Id: Ibf68d9ce7072680465662922f4aa15630545e3d6
Reviewed-on: https://skia-review.googlesource.com/3400
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

tests/ColorSpaceXformTest.cpp

diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index 0885d58..6cf0dbe 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -30,7 +30,8 @@
     return SkTAbs(x - y) <= 1;
 }
 
-static void test_identity_xform(skiatest::Reporter* r, const sk_sp<SkGammas>& gammas) {
+static void test_identity_xform(skiatest::Reporter* r, const sk_sp<SkGammas>& gammas,
+                                bool repeat) {
     // Arbitrary set of 10 pixels
     constexpr int width = 10;
     constexpr uint32_t srcPixels[width] = {
@@ -57,6 +58,12 @@
         REPORTER_ASSERT(r, almost_equal(((srcPixels[i] >> 24) & 0xFF),
                                         SkGetPackedA32(dstPixels[i])));
     }
+
+    if (repeat) {
+        // We should cache part of the transform after the run.  So it is interesting
+        // to make sure it still runs correctly the second time.
+        test_identity_xform(r, gammas, false);
+    }
 }
 
 DEF_TEST(ColorSpaceXform_TableGamma, r) {
@@ -81,7 +88,7 @@
     table[7] = 0.60f;
     table[8] = 0.75f;
     table[9] = 1.00f;
-    test_identity_xform(r, gammas);
+    test_identity_xform(r, gammas, true);
 }
 
 DEF_TEST(ColorSpaceXform_ParametricGamma, r) {
@@ -107,7 +114,7 @@
     params->fB = 0.055f / 1.055f;
     params->fC = 0.0f;
     params->fG = 2.4f;
-    test_identity_xform(r, gammas);
+    test_identity_xform(r, gammas, true);
 }
 
 DEF_TEST(ColorSpaceXform_ExponentialGamma, r) {
@@ -115,7 +122,7 @@
     sk_sp<SkGammas> gammas = sk_sp<SkGammas>(new SkGammas());
     gammas->fRedType = gammas->fGreenType = gammas->fBlueType = SkGammas::Type::kValue_Type;
     gammas->fRedData.fValue = gammas->fGreenData.fValue = gammas->fBlueData.fValue = 1.4f;
-    test_identity_xform(r, gammas);
+    test_identity_xform(r, gammas, true);
 }
 
 DEF_TEST(ColorSpaceXform_NamedGamma, r) {
@@ -124,7 +131,7 @@
     gammas->fRedData.fNamed = kSRGB_SkGammaNamed;
     gammas->fGreenData.fNamed = k2Dot2Curve_SkGammaNamed;
     gammas->fBlueData.fNamed = kLinear_SkGammaNamed;
-    test_identity_xform(r, gammas);
+    test_identity_xform(r, gammas, true);
 }
 
 DEF_TEST(ColorSpaceXform_NonMatchingGamma, r) {
@@ -165,7 +172,7 @@
     gammas->fBlueType = SkGammas::Type::kParam_Type;
     gammas->fBlueData.fParamOffset = sizeof(float) * tableSize;
 
-    test_identity_xform(r, gammas);
+    test_identity_xform(r, gammas, true);
 }
 
 DEF_TEST(ColorSpaceXform_applyCLUTMemoryAccess, r) {