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/GrEffect.cpp b/src/gpu/GrEffect.cpp
index d470c9c..dbfb6b0 100644
--- a/src/gpu/GrEffect.cpp
+++ b/src/gpu/GrEffect.cpp
@@ -58,12 +58,7 @@
int32_t GrBackendEffectFactory::fCurrEffectClassID = GrBackendEffectFactory::kIllegalEffectClassID;
-GrEffect::GrEffect(int numTextures)
- : fNumTextures(numTextures) {
-}
-
GrEffect::~GrEffect() {
-
}
bool GrEffect::isOpaque(bool inputTextureIsOpaque) const {
@@ -74,7 +69,6 @@
return this->getFactory().name();
}
-
bool GrEffect::isEqual(const GrEffect& s) const {
if (this->numTextures() != s.numTextures()) {
return false;
@@ -87,10 +81,8 @@
return true;
}
-const GrTextureAccess& GrEffect::textureAccess(int index) const {
- GrCrash("We shouldn't be calling this function on the base class.");
- static GrTextureAccess kDummy;
- return kDummy;
+void GrEffect::addTextureAccess(const GrTextureAccess* access) {
+ fTextureAccesses.push_back(access);
}
void * GrEffect::operator new(size_t size) {