From c78188896e28a4ae49e406a7422b345ae177dafe Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 20 Mar 2013 19:19:53 +0000 Subject: Attempt to reland 8264-5 with warning-as-error fixes. git-svn-id: http://skia.googlecode.com/svn/trunk@8272 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/GrBackendEffectFactory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/gpu/GrBackendEffectFactory.h') diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h index 99d6a73a25..da296c9469 100644 --- a/include/gpu/GrBackendEffectFactory.h +++ b/include/gpu/GrBackendEffectFactory.h @@ -24,16 +24,16 @@ */ class GrEffectRef; -class GrEffectStage; class GrGLEffect; class GrGLCaps; +class GrDrawEffect; class GrBackendEffectFactory : public GrNoncopyable { public: typedef uint32_t EffectKey; enum { kNoEffectKey = 0, - kEffectKeyBits = 12, + kEffectKeyBits = 16, /** * Some aspects of the generated code may be determined by the particular textures that are * associated with the effect. These manipulations are performed by GrGLShaderBuilder beyond @@ -44,8 +44,8 @@ public: kAttribKeyBits = 6 }; - virtual EffectKey glEffectKey(const GrEffectStage&, const GrGLCaps&) const = 0; - virtual GrGLEffect* createGLInstance(const GrEffectRef&) const = 0; + virtual EffectKey glEffectKey(const GrDrawEffect&, const GrGLCaps&) const = 0; + virtual GrGLEffect* createGLInstance(const GrDrawEffect&) const = 0; bool operator ==(const GrBackendEffectFactory& b) const { return fEffectClassID == b.fEffectClassID; -- cgit v1.2.3