commit 958a3bb6708c60e7ff47b58b872cb0b77bd066f4
author Brian Osman <brianosman@google.com> Thu Jul 30 14:13:23 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 30 19:36:20 2020 +0000
tree 73ec5e7c90ac7be3e76c12e9727828c49f8fbd80
parent 6f65f1a7496ef287d14fcb6ecd18d972e172a38a

Move paint modulation after color space xform when drawing images

The paint color has already been transformed to the destination color
space, so this prevents a double-transform when doing alpha-image draws.

Bug: skia:10555
Change-Id: I9d026d231199b22d9a67bc92bfe9a615295490b8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306855
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index e06e8b1..9fbdca1 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -501,15 +501,12 @@
     } else {
         fp = producer->createFragmentProcessor(textureMatrix, subset, domain, sampler);
     }
-    if (fp) {
-        fp = GrBlendFragmentProcessor::Make(std::move(fp), nullptr, SkBlendMode::kModulate);
-    }
-    fp = GrColorSpaceXformEffect::Make(std::move(fp),
-                                       producer->colorSpace(), producer->alphaType(),
-                                       rtc->colorInfo().colorSpace(), kPremul_SkAlphaType);
     if (!fp) {
         return;
     }
+    fp = GrColorSpaceXformEffect::Make(std::move(fp), producer->colorSpace(), producer->alphaType(),
+                                       rtc->colorInfo().colorSpace(), kPremul_SkAlphaType);
+    fp = GrBlendFragmentProcessor::Make(std::move(fp), nullptr, SkBlendMode::kModulate);
 
     GrPaint grPaint;
     if (!SkPaintToGrPaintWithTexture(context, rtc->colorInfo(), paint, matrixProvider,