| Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| index 406f1b022d0d23c68ef1104c9d7285c49e98ed55..da2e3da175fd79f6243336bb4c908b0e97d28e63 100755
|
| --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
|
| @@ -198,9 +198,8 @@ GrDistanceFieldTextureEffect::GrDistanceFieldTextureEffect(GrTexture* texture,
|
|
|
| bool GrDistanceFieldTextureEffect::onIsEqual(const GrGeometryProcessor& other) const {
|
| const GrDistanceFieldTextureEffect& cte = other.cast<GrDistanceFieldTextureEffect>();
|
| - return fTextureAccess == cte.fTextureAccess &&
|
| + return
|
| #ifdef SK_GAMMA_APPLY_TO_A8
|
| - fGammaTextureAccess == cte.fGammaTextureAccess &&
|
| fLuminance == cte.fLuminance &&
|
| #endif
|
| fFlags == cte.fFlags;
|
| @@ -382,7 +381,7 @@ GrDistanceFieldNoGammaTextureEffect::GrDistanceFieldNoGammaTextureEffect(GrTextu
|
| bool GrDistanceFieldNoGammaTextureEffect::onIsEqual(const GrGeometryProcessor& other) const {
|
| const GrDistanceFieldNoGammaTextureEffect& cte =
|
| other.cast<GrDistanceFieldNoGammaTextureEffect>();
|
| - return fTextureAccess == cte.fTextureAccess && fFlags == cte.fFlags;
|
| + return fFlags == cte.fFlags;
|
| }
|
|
|
| void GrDistanceFieldNoGammaTextureEffect::onComputeInvariantOutput(InvariantOutput* inout) const {
|
| @@ -630,9 +629,7 @@ GrDistanceFieldLCDTextureEffect::GrDistanceFieldLCDTextureEffect(
|
|
|
| bool GrDistanceFieldLCDTextureEffect::onIsEqual(const GrGeometryProcessor& other) const {
|
| const GrDistanceFieldLCDTextureEffect& cte = other.cast<GrDistanceFieldLCDTextureEffect>();
|
| - return (fTextureAccess == cte.fTextureAccess &&
|
| - fGammaTextureAccess == cte.fGammaTextureAccess &&
|
| - fTextColor == cte.fTextColor &&
|
| + return (fTextColor == cte.fTextColor &&
|
| fFlags == cte.fFlags);
|
| }
|
|
|
|
|