| Index: src/gpu/effects/GrTextureDomainEffect.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
|
| index 96372d926f6bd7eb7771e4b654ac948f3506584f..eb4001d949dced54e9613900f7baf47726d51013 100644
|
| --- a/src/gpu/effects/GrTextureDomainEffect.cpp
|
| +++ b/src/gpu/effects/GrTextureDomainEffect.cpp
|
| @@ -153,11 +153,11 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| WrapMode wrapMode,
|
| - bool bilerp,
|
| + GrTextureParams::FilterMode filterMode,
|
| CoordsType coordsType) {
|
| static const SkRect kFullRect = {0, 0, SK_Scalar1, SK_Scalar1};
|
| if (kClamp_WrapMode == wrapMode && domain.contains(kFullRect)) {
|
| - return GrSimpleTextureEffect::Create(texture, matrix, bilerp);
|
| + return GrSimpleTextureEffect::Create(texture, matrix, filterMode);
|
| } else {
|
| SkRect clippedDomain;
|
| // We don't currently handle domains that are empty or don't intersect the texture.
|
| @@ -176,7 +176,7 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture,
|
| matrix,
|
| clippedDomain,
|
| wrapMode,
|
| - bilerp,
|
| + filterMode,
|
| coordsType)));
|
| return CreateEffectRef(effect);
|
|
|
| @@ -187,9 +187,9 @@ GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const SkRect& domain,
|
| WrapMode wrapMode,
|
| - bool bilerp,
|
| + GrTextureParams::FilterMode filterMode,
|
| CoordsType coordsType)
|
| - : GrSingleTextureEffect(texture, matrix, bilerp, coordsType)
|
| + : GrSingleTextureEffect(texture, matrix, filterMode, coordsType)
|
| , fWrapMode(wrapMode)
|
| , fTextureDomain(domain) {
|
| }
|
| @@ -239,6 +239,6 @@ GrEffectRef* GrTextureDomainEffect::TestCreate(SkMWCRandom* random,
|
| matrix,
|
| domain,
|
| wrapMode,
|
| - bilerp,
|
| + bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
|
| coords);
|
| }
|
|
|