Make GrEffect::textureAccess non-virtual. Require subclasses to append their GrTAs.
Review URL: https://codereview.appspot.com/7062063
git-svn-id: http://skia.googlecode.com/svn/trunk@7129 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp
index 05eff6b..14f5b64 100644
--- a/src/gpu/effects/GrSingleTextureEffect.cpp
+++ b/src/gpu/effects/GrSingleTextureEffect.cpp
@@ -58,51 +58,46 @@
///////////////////////////////////////////////////////////////////////////////
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture)
- : INHERITED(1)
- , fTextureAccess(texture) {
+ : fTextureAccess(texture) {
fMatrix.reset();
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, bool bilerp)
- : INHERITED(1)
- , fTextureAccess(texture, bilerp) {
+ : fTextureAccess(texture, bilerp) {
fMatrix.reset();
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const GrTextureParams& params)
- : INHERITED(1)
- , fTextureAccess(texture, params) {
+ : fTextureAccess(texture, params) {
fMatrix.reset();
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const SkMatrix& m)
- : INHERITED(1)
- , fTextureAccess(texture)
+ : fTextureAccess(texture)
, fMatrix(m) {
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const SkMatrix& m, bool bilerp)
- : INHERITED(1)
- , fTextureAccess(texture, bilerp)
+ : fTextureAccess(texture, bilerp)
, fMatrix(m) {
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture,
const SkMatrix& m,
const GrTextureParams& params)
- : INHERITED(1)
- , fTextureAccess(texture, params)
+ : fTextureAccess(texture, params)
, fMatrix(m) {
+ this->addTextureAccess(&fTextureAccess);
}
GrSingleTextureEffect::~GrSingleTextureEffect() {
}
-const GrTextureAccess& GrSingleTextureEffect::textureAccess(int index) const {
- GrAssert(0 == index);
- return fTextureAccess;
-}
-
const GrBackendEffectFactory& GrSingleTextureEffect::getFactory() const {
return GrTBackendEffectFactory<GrSingleTextureEffect>::getInstance();
}