diff options
| author |  Brian Osman <brianosman@google.com> | 2017-10-18 13:15:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-18 18:46:25 +0000 |
| commit | 2240be96d97b5ac0886381d74a21f1e2a0928f55 (patch) | |
| tree | e0148f28dd2eb10bbfd3541213e4720b10b043b0 /gm | |
| parent | 8fed655df87618f8460af2a6284bdef764cf84c8 (diff) | |
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>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/texdata.cpp | 2 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gm/texdata.cpp b/gm/texdata.cpp index 4f0a0b154a..4b63e2ea69 100644 --- a/gm/texdata.cpp +++ b/gm/texdata.cpp @@ -117,7 +117,7 @@ DEF_SIMPLE_GM_BG(texdata, canvas, 2 * S, 2 * S, SK_ColorBLACK) { } 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)); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 03c2b966ca..3dd0847912 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -123,7 +123,7 @@ protected: 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); |