diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-22 13:02:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-22 18:51:33 +0000 |
| commit | e522f4c455d0d5dbe813f38d16c0d4cd46fa5dee (patch) | |
| tree | e0be77c59c8b06ac3b284104ab946613f2b6bdd7 /tests | |
| parent | 416bbd97cee9e221577c729a8072fdb2057cbdf8 (diff) | |
Enable legacy premuls in SkColorSpaceXform
***Will allow for simplified Android framework code, they typically
want a color correct transform followed by a gamma encoded premul.
***Chrome does the same, so this will make it easier to replace their
codecs.
***Will decrease code size. Both types of premuls are moved off the
fast path here - one is essentially unused in production and the
other is not "encouraged".
***Will actually make the common case faster: sRGB->sRGB means no
color xform, just premul in SkSwizzler.
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: Ia4ec1d273b6f137151f951d37c0ebf975f6b9a3e
Reviewed-on: https://skia-review.googlesource.com/8848
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index 2bc735aaef..73a49807f3 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -311,6 +311,13 @@ DEF_TEST(ColorSpace_Equals, r) { REPORTER_ASSERT(r, !SkColorSpace::Equals(upperRight.get(), adobe.get())); REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), rgb4.get())); REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), rgb4.get())); + + sk_sp<SkColorSpace> srgbFlag = + SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, + SkColorSpace::kSRGB_Gamut, + SkColorSpace::kNonLinearBlending_ColorSpaceFlag); + REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), srgbFlag.get())); + REPORTER_ASSERT(r, SkColorSpace_Base::EqualsIgnoreFlags(srgb.get(), srgbFlag.get())); } static inline bool matrix_almost_equal(const SkMatrix44& a, const SkMatrix44& b) { |