| Index: src/effects/SkTableColorFilter.cpp
|
| diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
|
| index 4cf09877c4d53f93a69f8734bb417d7447ac236c..e9ce20f6c1d3837025969af3df711d8c5bf334df 100644
|
| --- a/src/effects/SkTableColorFilter.cpp
|
| +++ b/src/effects/SkTableColorFilter.cpp
|
| @@ -270,7 +270,7 @@ public:
|
|
|
| virtual void emitCode(GrGLShaderBuilder*,
|
| const GrDrawEffect&,
|
| - EffectKey,
|
| + const GrEffectKey&,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| @@ -278,7 +278,7 @@ public:
|
|
|
| virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
|
|
|
| - static EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&);
|
| + static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {}
|
|
|
| private:
|
|
|
| @@ -291,7 +291,7 @@ GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, co
|
|
|
| void GLColorTableEffect::emitCode(GrGLShaderBuilder* builder,
|
| const GrDrawEffect&,
|
| - EffectKey,
|
| + const GrEffectKey&,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| @@ -333,10 +333,6 @@ void GLColorTableEffect::emitCode(GrGLShaderBuilder* builder,
|
| builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
|
| }
|
|
|
| -GrGLEffect::EffectKey GLColorTableEffect::GenKey(const GrDrawEffect&, const GrGLCaps&) {
|
| - return 0;
|
| -}
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| ColorTableEffect::ColorTableEffect(GrTexture* texture, unsigned flags)
|
|
|