| Index: src/gpu/effects/GrTextureDomain.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
|
| index 93a548a0476cf53dfb514cb3fc9bce0d25820677..bf8bb59205693b166685f4f4a008e5ad2e87a0ec 100644
|
| --- a/src/gpu/effects/GrTextureDomain.cpp
|
| +++ b/src/gpu/effects/GrTextureDomain.cpp
|
| @@ -215,8 +215,7 @@ void GrGLTextureDomainEffect::GenKey(const GrProcessor& processor, const GrGLSLC
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrFragmentProcessor* GrTextureDomainEffect::Create(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| GrTextureDomain::Mode mode,
|
| @@ -225,21 +224,19 @@ GrFragmentProcessor* GrTextureDomainEffect::Create(GrProcessorDataManager* procD
|
| 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(procDataManager, texture, matrix, filterMode);
|
| + return GrSimpleTextureEffect::Create(texture, matrix, filterMode);
|
| } else {
|
| - return new GrTextureDomainEffect(procDataManager, texture, matrix, domain, mode, filterMode,
|
| - coordSet);
|
| + return new GrTextureDomainEffect(texture, matrix, domain, mode, filterMode, coordSet);
|
| }
|
| }
|
|
|
| -GrTextureDomainEffect::GrTextureDomainEffect(GrProcessorDataManager* procDataManager,
|
| - GrTexture* texture,
|
| +GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| GrTextureDomain::Mode mode,
|
| GrTextureParams::FilterMode filterMode,
|
| GrCoordSet coordSet)
|
| - : GrSingleTextureEffect(procDataManager, texture, matrix, filterMode, coordSet)
|
| + : GrSingleTextureEffect(texture, matrix, filterMode, coordSet)
|
| , fTextureDomain(domain, mode) {
|
| SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
|
| filterMode == GrTextureParams::kNone_FilterMode);
|
| @@ -293,8 +290,7 @@ 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->fProcDataManager,
|
| - d->fTextures[texIdx],
|
| + return GrTextureDomainEffect::Create(d->fTextures[texIdx],
|
| matrix,
|
| domain,
|
| mode,
|
|
|