commit 2240be96d97b5ac0886381d74a21f1e2a0928f55
author Brian Osman <brianosman@google.com> Wed Oct 18 13:15:13 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 18 18:46:25 2017 +0000
tree e0148f28dd2eb10bbfd3541213e4720b10b043b0
parent 8fed655df87618f8460af2a6284bdef764cf84c8

Remove color space xform from GrTextureDomain & GrSimpleTextureEffect

Bug: skia:
Change-Id: I31435d334da28cce9bbc654c4b98746b03078897
Reviewed-on: https://skia-review.googlesource.com/61460
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

gm/texdata.cpp

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 4f0a0b1..4b63e2e 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -117,7 +117,7 @@
         } else {
             vm.reset();
         }
-        paint.addColorTextureProcessor(tContext->asTextureProxyRef(), nullptr, vm);
+        paint.addColorTextureProcessor(tContext->asTextureProxyRef(), vm);
 
         renderTargetContext->drawRect(clip, GrPaint::Clone(paint), GrAA::kNo, vm,
                                       SkRect::MakeWH(2 * S, 2 * S));

gm/texturedomaineffect.cpp

diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 03c2b96..3dd0847 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -123,7 +123,7 @@
                     GrPaint grPaint;
                     grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
                     auto fp = GrTextureDomainEffect::Make(
-                            proxy, nullptr, textureMatrices[tm],
+                            proxy, textureMatrices[tm],
                             GrTextureDomain::MakeTexelDomainForMode(texelDomains[d], mode), mode,
                             GrSamplerState::Filter::kNearest);