| Index: include/gpu/GrTBackendEffectFactory.h
|
| ===================================================================
|
| --- include/gpu/GrTBackendEffectFactory.h (revision 8241)
|
| +++ include/gpu/GrTBackendEffectFactory.h (working copy)
|
| @@ -9,7 +9,7 @@
|
| #define GrTBackendEffectFactory_DEFINED
|
|
|
| #include "GrBackendEffectFactory.h"
|
| -#include "GrEffectStage.h"
|
| +#include "GrDrawEffect.h"
|
|
|
| /**
|
| * Implements GrBackendEffectFactory for a GrEffect subclass as a singleton.
|
| @@ -30,12 +30,12 @@
|
| id identifies the GrEffect subclass. The remainder is based
|
| on the aspects of the GrEffect object's configuration that affect
|
| GLSL code generation. */
|
| - virtual EffectKey glEffectKey(const GrEffectStage& stage,
|
| + virtual EffectKey glEffectKey(const GrDrawEffect& drawEffect,
|
| const GrGLCaps& caps) const SK_OVERRIDE {
|
| GrAssert(kIllegalEffectClassID != fEffectClassID);
|
| - EffectKey effectKey = GLEffect::GenKey(stage, caps);
|
| - EffectKey textureKey = GLEffect::GenTextureKey(stage.getEffect(), caps);
|
| - EffectKey attribKey = GLEffect::GenAttribKey(stage);
|
| + EffectKey effectKey = GLEffect::GenKey(drawEffect, caps);
|
| + EffectKey textureKey = GLEffect::GenTextureKey(drawEffect, caps);
|
| + EffectKey attribKey = GLEffect::GenAttribKey(drawEffect);
|
| #if GR_DEBUG
|
| static const EffectKey kIllegalIDMask = (uint16_t) (~((1U << kEffectKeyBits) - 1));
|
| GrAssert(!(kIllegalIDMask & effectKey));
|
| @@ -53,8 +53,8 @@
|
| /** Returns a new instance of the appropriate *GL* implementation class
|
| for the given GrEffect; caller is responsible for deleting
|
| the object. */
|
| - virtual GLEffect* createGLInstance(const GrEffectRef& effect) const SK_OVERRIDE {
|
| - return SkNEW_ARGS(GLEffect, (*this, effect));
|
| + virtual GLEffect* createGLInstance(const GrDrawEffect& drawEffect) const SK_OVERRIDE {
|
| + return SkNEW_ARGS(GLEffect, (*this, drawEffect));
|
| }
|
|
|
| /** This class is a singleton. This function returns the single instance.
|
|
|