From 50db75c871b203081a32190ab173f13c785a147f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 11 Jan 2013 13:54:30 +0000 Subject: 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 --- src/effects/gradients/SkGradientShader.cpp | 9 ++------- src/effects/gradients/SkGradientShaderPriv.h | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src/effects/gradients') diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 5b2a60e944..8521bdbf61 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -742,8 +742,7 @@ void GrGLGradientEffect::emitColorLookup(GrGLShaderBuilder* builder, GrGradientEffect::GrGradientEffect(GrContext* ctx, const SkGradientShaderBase& shader, const SkMatrix& matrix, - SkShader::TileMode tileMode) - : INHERITED(1) { + SkShader::TileMode tileMode) { // TODO: check for simple cases where we don't need a texture: //GradientInfo info; //shader.asAGradient(&info); @@ -783,6 +782,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, // the cache, but it'll still be ref'd until it's no longer being used. GrUnlockCachedBitmapTexture(texture); } + this->addTextureAccess(&fTextureAccess); } GrGradientEffect::~GrGradientEffect() { @@ -791,11 +791,6 @@ GrGradientEffect::~GrGradientEffect() { } } -const GrTextureAccess& GrGradientEffect::textureAccess(int index) const { - GrAssert(0 == index); - return fTextureAccess; -} - int GrGradientEffect::RandomGradientParams(SkRandom* random, SkColor colors[], SkScalar** stops, diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 1662188d05..552013efa5 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -233,8 +233,6 @@ public: virtual ~GrGradientEffect(); - virtual const GrTextureAccess& textureAccess(int index) const SK_OVERRIDE; - bool useAtlas() const { return SkToBool(-1 != fRow); } SkScalar getYCoord() const { return fYCoord; }; const SkMatrix& getMatrix() const { return fMatrix;} -- cgit v1.2.3