diff options
Diffstat (limited to 'src/gpu/effects/GrSingleTextureEffect.h')
-rw-r--r-- | src/gpu/effects/GrSingleTextureEffect.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h index 82037cf6e9..4f25ddb38d 100644 --- a/src/gpu/effects/GrSingleTextureEffect.h +++ b/src/gpu/effects/GrSingleTextureEffect.h @@ -14,8 +14,7 @@ class GrTexture; /** - * A base class for effects that draw a single texture with a texture matrix. This effect has no - * backend implementations. One must be provided by the subclass. + * A base class for effects that draw a single texture with a texture matrix. */ class GrSingleTextureEffect : public GrEffect { public: @@ -23,29 +22,20 @@ public: const SkMatrix& getMatrix() const { return fMatrix; } - /** Indicates whether the matrix operates on local coords or positions */ - CoordsType coordsType() const { return fCoordsType; } - protected: - /** unfiltered, clamp mode */ - GrSingleTextureEffect(GrTexture*, const SkMatrix&, CoordsType = kLocal_CoordsType); - /** clamp mode */ - GrSingleTextureEffect(GrTexture*, const SkMatrix&, bool bilerp, CoordsType = kLocal_CoordsType); - GrSingleTextureEffect(GrTexture*, - const SkMatrix&, - const GrTextureParams&, - CoordsType = kLocal_CoordsType); + GrSingleTextureEffect(GrTexture*, const SkMatrix&); /* unfiltered, clamp mode */ + GrSingleTextureEffect(GrTexture*, const SkMatrix&, bool bilerp); /* clamp mode */ + GrSingleTextureEffect(GrTexture*, const SkMatrix&, const GrTextureParams&); /** * Helper for subclass onIsEqual() functions. */ - bool hasSameTextureParamsMatrixAndCoordsType(const GrSingleTextureEffect& other) const { + bool hasSameTextureParamsAndMatrix(const GrSingleTextureEffect& other) const { const GrTextureAccess& otherAccess = other.fTextureAccess; // We don't have to check the accesses' swizzles because they are inferred from the texture. return fTextureAccess.getTexture() == otherAccess.getTexture() && fTextureAccess.getParams() == otherAccess.getParams() && - this->getMatrix().cheapEqualTo(other.getMatrix()) && - fCoordsType == other.fCoordsType; + this->getMatrix().cheapEqualTo(other.getMatrix()); } /** @@ -65,7 +55,6 @@ protected: private: GrTextureAccess fTextureAccess; SkMatrix fMatrix; - CoordsType fCoordsType; typedef GrEffect INHERITED; }; |