| Index: src/effects/SkTableColorFilter.cpp
|
| ===================================================================
|
| --- src/effects/SkTableColorFilter.cpp (revision 8241)
|
| +++ src/effects/SkTableColorFilter.cpp (working copy)
|
| @@ -256,33 +256,31 @@
|
|
|
| class GLColorTableEffect : public GrGLEffect {
|
| public:
|
| - GLColorTableEffect(const GrBackendEffectFactory&, const GrEffectRef&);
|
| + GLColorTableEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
|
|
|
| virtual void emitCode(GrGLShaderBuilder*,
|
| - const GrEffectStage&,
|
| + const GrDrawEffect&,
|
| EffectKey,
|
| - const char* vertexCoords,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TextureSamplerArray&) SK_OVERRIDE;
|
|
|
| - virtual void setData(const GrGLUniformManager&, const GrEffectStage&) SK_OVERRIDE {}
|
| + virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
|
|
|
| - static EffectKey GenKey(const GrEffectStage&, const GrGLCaps&);
|
| + static EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&);
|
|
|
| private:
|
|
|
| typedef GrGLEffect INHERITED;
|
| };
|
|
|
| -GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, const GrEffectRef&)
|
| +GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
|
| : INHERITED(factory) {
|
| }
|
|
|
| void GLColorTableEffect::emitCode(GrGLShaderBuilder* builder,
|
| - const GrEffectStage&,
|
| + const GrDrawEffect&,
|
| EffectKey,
|
| - const char* vertexCoords,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TextureSamplerArray& samplers) {
|
| @@ -323,7 +321,7 @@
|
| builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
|
| }
|
|
|
| -GrGLEffect::EffectKey GLColorTableEffect::GenKey(const GrEffectStage&, const GrGLCaps&) {
|
| +GrGLEffect::EffectKey GLColorTableEffect::GenKey(const GrDrawEffect&, const GrGLCaps&) {
|
| return 0;
|
| }
|
|
|
|
|