| Index: src/gpu/effects/GrTextureDomain.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
|
| index 3fbf0008a40c5f870ad70f840946ce283ef54b68..814d193fde27244c4d6af391a347acd8807d551b 100644
|
| --- a/src/gpu/effects/GrTextureDomain.cpp
|
| +++ b/src/gpu/effects/GrTextureDomain.cpp
|
| @@ -219,6 +219,7 @@ void GrGLTextureDomainEffect::GenKey(const GrProcessor& processor, const GrGLSLC
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| sk_sp<GrFragmentProcessor> GrTextureDomainEffect::Make(GrTexture* texture,
|
| + sk_sp<GrColorSpaceXform> colorSpaceXform,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| GrTextureDomain::Mode mode,
|
| @@ -227,20 +228,22 @@ sk_sp<GrFragmentProcessor> GrTextureDomainEffect::Make(GrTexture* texture,
|
| static const SkRect kFullRect = {0, 0, SK_Scalar1, SK_Scalar1};
|
| if (GrTextureDomain::kIgnore_Mode == mode ||
|
| (GrTextureDomain::kClamp_Mode == mode && domain.contains(kFullRect))) {
|
| - return GrSimpleTextureEffect::Make(texture, matrix, filterMode);
|
| + return GrSimpleTextureEffect::Make(texture, std::move(colorSpaceXform), matrix, filterMode);
|
| } else {
|
| return sk_sp<GrFragmentProcessor>(
|
| - new GrTextureDomainEffect(texture, matrix, domain, mode, filterMode, coordSet));
|
| + new GrTextureDomainEffect(texture, std::move(colorSpaceXform), matrix, domain, mode,
|
| + filterMode, coordSet));
|
| }
|
| }
|
|
|
| GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
|
| + sk_sp<GrColorSpaceXform> colorSpaceXform,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| GrTextureDomain::Mode mode,
|
| GrTextureParams::FilterMode filterMode,
|
| GrCoordSet coordSet)
|
| - : GrSingleTextureEffect(texture, matrix, filterMode, coordSet)
|
| + : GrSingleTextureEffect(texture, std::move(colorSpaceXform), matrix, filterMode, coordSet)
|
| , fTextureDomain(domain, mode) {
|
| SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
|
| filterMode == GrTextureParams::kNone_FilterMode);
|
| @@ -294,6 +297,7 @@ sk_sp<GrFragmentProcessor> GrTextureDomainEffect::TestCreate(GrProcessorTestData
|
| GrCoordSet coords = d->fRandom->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet;
|
| return GrTextureDomainEffect::Make(
|
| d->fTextures[texIdx],
|
| + nullptr,
|
| matrix,
|
| domain,
|
| mode,
|
|
|