diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-09-16 07:17:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-16 07:17:28 -0700 |
| commit | 08da4f22d790cfc51bbeb10b4b84dab49cf0eaec (patch) | |
| tree | eb2c5cc2e59b708065484e18c01f459f6ef59ee9 /src/effects/SkTableColorFilter.cpp | |
| parent | 8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e (diff) | |
Revert of removing GrDrawEffect (patchset #4 id:60001 of https://codereview.chromium.org/571163002/)
Reason for revert:
reverting to unblock another revert
Original issue's description:
> removing GrDrawEffect
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e
R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/577593003
Diffstat (limited to 'src/effects/SkTableColorFilter.cpp')
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 548a928943..3cab107373 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -314,31 +314,31 @@ private: class GLColorTableEffect : public GrGLEffect { public: - GLColorTableEffect(const GrBackendEffectFactory&, const GrEffect&); + GLColorTableEffect(const GrBackendEffectFactory&, const GrDrawEffect&); virtual void emitCode(GrGLProgramBuilder*, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey&, const char* outputColor, const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE {} + virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE {} - static void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {} + static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {} private: typedef GrGLEffect INHERITED; }; -GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, const GrEffect&) +GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&) : INHERITED(factory) { } void GLColorTableEffect::emitCode(GrGLProgramBuilder* builder, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey&, const char* outputColor, const char* inputColor, |