commit a50205fca5f7cff36dd3adac841b4c23a90a0b7d
author Brian Osman <brianosman@google.com> Fri Jul 06 13:57:01 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 06 18:34:58 2018 +0000
tree 4aa111a0c4b80400dfa39ef5b36e8ef391c164ab
parent 5a619a740f12f0b1f504f305b8964efe4c85ee26

Add color type to the image filter DAG's OutputProperties

Don't try to guess the pixel config to use for intermediates. Instead,
just make the intermediates in the same color type (and space) as the
final destination. This removes some no-longer-correct logic that was
using sRGB configs, resulting in linear blending and precision loss.

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

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index d2549c4..368e594 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -87,7 +87,7 @@
 
     //--------------
     // Test that draw restricts itself to the subset
-    SkImageFilter::OutputProperties outProps(img->getColorSpace());
+    SkImageFilter::OutputProperties outProps(kN32_SkColorType, img->getColorSpace());
     sk_sp<SkSpecialSurface> surf(img->makeSurface(outProps, SkISize::Make(kFullSize, kFullSize),
                                                   kPremul_SkAlphaType));
 
@@ -124,7 +124,7 @@
         REPORTER_ASSERT(reporter, isGPUBacked != !!tightImg->peekPixels(&tmpPixmap));
     }
     {
-        SkImageFilter::OutputProperties outProps(img->getColorSpace());
+        SkImageFilter::OutputProperties outProps(kN32_SkColorType, img->getColorSpace());
         sk_sp<SkSurface> tightSurf(img->makeTightSurface(outProps, subset.size()));
 
         REPORTER_ASSERT(reporter, tightSurf->width() == subset.width());