| Index: src/gpu/effects/GrTextureDomain.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
|
| index 108ec78740821b34ef9e54a28ea0e9eb4d10b756..5af5bc86f3a95eb339a7bc824fa114234f8f5eb5 100644
|
| --- a/src/gpu/effects/GrTextureDomain.cpp
|
| +++ b/src/gpu/effects/GrTextureDomain.cpp
|
| @@ -147,7 +147,7 @@ public:
|
|
|
| virtual void emitCode(GrGLShaderBuilder*,
|
| const GrDrawEffect&,
|
| - EffectKey,
|
| + const GrEffectKey&,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| @@ -155,7 +155,7 @@ public:
|
|
|
| virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
|
|
|
| - static inline EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&);
|
| + static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
|
|
|
| private:
|
| GrTextureDomain::GLDomain fGLDomain;
|
| @@ -169,7 +169,7 @@ GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrBackendEffectFactory& f
|
|
|
| void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder,
|
| const GrDrawEffect& drawEffect,
|
| - EffectKey key,
|
| + const GrEffectKey& key,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray& coords,
|
| @@ -188,10 +188,10 @@ void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman,
|
| fGLDomain.setData(uman, domain, effect.texture(0)->origin());
|
| }
|
|
|
| -GrGLEffect::EffectKey GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEffect,
|
| - const GrGLCaps&) {
|
| +void GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
|
| + GrEffectKeyBuilder* b) {
|
| const GrTextureDomain& domain = drawEffect.castEffect<GrTextureDomainEffect>().textureDomain();
|
| - return GrTextureDomain::GLDomain::DomainKey(domain);
|
| + b->add32(GrTextureDomain::GLDomain::DomainKey(domain));
|
| }
|
|
|
|
|
|
|