| Index: src/gpu/effects/GrTextureDomain.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
|
| index cd89a59ac875a96f3b82ab053da85cbe87a91eaf..b4bdd7fb1f893b73e0e5389faf53edb988107ff0 100644
|
| --- a/src/gpu/effects/GrTextureDomain.cpp
|
| +++ b/src/gpu/effects/GrTextureDomain.cpp
|
| @@ -219,17 +219,17 @@ void GrGLTextureDomainEffect::GenKey(const GrProcessor& processor, const GrGLSLC
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| const GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture,
|
| - const SkMatrix& matrix,
|
| - const SkRect& domain,
|
| - GrTextureDomain::Mode mode,
|
| - GrTextureParams::FilterMode filterMode,
|
| - GrCoordSet coordSet) {
|
| + const SkMatrix& matrix,
|
| + const SkRect& domain,
|
| + GrTextureDomain::Mode mode,
|
| + GrTextureParams::FilterMode filterMode,
|
| + GrCoordSet coordSet, GrRenderTarget* dst) {
|
| static const SkRect kFullRect = {0, 0, SK_Scalar1, SK_Scalar1};
|
| if (GrTextureDomain::kIgnore_Mode == mode ||
|
| (GrTextureDomain::kClamp_Mode == mode && domain.contains(kFullRect))) {
|
| - return GrSimpleTextureEffect::Create(texture, matrix, filterMode);
|
| + return GrSimpleTextureEffect::Create(texture, matrix, filterMode, kLocal_GrCoordSet, dst);
|
| } else {
|
| - return new GrTextureDomainEffect(texture, matrix, domain, mode, filterMode, coordSet);
|
| + return new GrTextureDomainEffect(texture, matrix, domain, mode, filterMode, coordSet, dst);
|
| }
|
| }
|
|
|
| @@ -238,8 +238,9 @@ GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
|
| const SkRect& domain,
|
| GrTextureDomain::Mode mode,
|
| GrTextureParams::FilterMode filterMode,
|
| - GrCoordSet coordSet)
|
| - : GrSingleTextureEffect(texture, matrix, filterMode, coordSet)
|
| + GrCoordSet coordSet,
|
| + GrRenderTarget* dst)
|
| + : GrSingleTextureEffect(texture, matrix, filterMode, coordSet, dst)
|
| , fTextureDomain(domain, mode) {
|
| SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
|
| filterMode == GrTextureParams::kNone_FilterMode);
|
| @@ -291,11 +292,10 @@ const GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData
|
| const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
|
| bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false;
|
| GrCoordSet coords = d->fRandom->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet;
|
| - return GrTextureDomainEffect::Create(
|
| - d->fTextures[texIdx],
|
| - matrix,
|
| - domain,
|
| - mode,
|
| - bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
|
| - coords);
|
| + return GrTextureDomainEffect::Create(d->fTextures[texIdx],
|
| + matrix,
|
| + domain,
|
| + mode,
|
| + bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
|
| + coords, NULL);
|
| }
|
|
|