diff options
author | 2014-09-16 07:17:28 -0700 | |
---|---|---|
committer | 2014-09-16 07:17:28 -0700 | |
commit | 08da4f22d790cfc51bbeb10b4b84dab49cf0eaec (patch) | |
tree | eb2c5cc2e59b708065484e18c01f459f6ef59ee9 /src/effects/SkMorphologyImageFilter.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/SkMorphologyImageFilter.cpp')
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 02c0be1674..df04cb170d 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -328,19 +328,19 @@ private: class GrGLMorphologyEffect : public GrGLEffect { public: - GrGLMorphologyEffect (const GrBackendEffectFactory&, const GrEffect&); + GrGLMorphologyEffect (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; - static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder* b); + static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b); - virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE; + virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE; private: int width() const { return GrMorphologyEffect::WidthFromRadius(fRadius); } @@ -353,15 +353,15 @@ private: }; GrGLMorphologyEffect::GrGLMorphologyEffect(const GrBackendEffectFactory& factory, - const GrEffect& effect) + const GrDrawEffect& drawEffect) : INHERITED(factory) { - const GrMorphologyEffect& m = effect.cast<GrMorphologyEffect>(); + const GrMorphologyEffect& m = drawEffect.castEffect<GrMorphologyEffect>(); fRadius = m.radius(); fType = m.type(); } void GrGLMorphologyEffect::emitCode(GrGLProgramBuilder* builder, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey& key, const char* outputColor, const char* inputColor, @@ -401,17 +401,17 @@ void GrGLMorphologyEffect::emitCode(GrGLProgramBuilder* builder, fsBuilder->codeAppend(modulate.c_str()); } -void GrGLMorphologyEffect::GenKey(const GrEffect& effect, +void GrGLMorphologyEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) { - const GrMorphologyEffect& m = effect.cast<GrMorphologyEffect>(); + const GrMorphologyEffect& m = drawEffect.castEffect<GrMorphologyEffect>(); uint32_t key = static_cast<uint32_t>(m.radius()); key |= (m.type() << 8); b->add32(key); } void GrGLMorphologyEffect::setData(const GrGLProgramDataManager& pdman, - const GrEffect& effect) { - const Gr1DKernelEffect& kern = effect.cast<Gr1DKernelEffect>(); + const GrDrawEffect& drawEffect) { + const Gr1DKernelEffect& kern = drawEffect.castEffect<Gr1DKernelEffect>(); GrTexture& texture = *kern.texture(0); // the code we generated was for a specific kernel radius SkASSERT(kern.radius() == fRadius); @@ -447,7 +447,7 @@ const GrBackendEffectFactory& GrMorphologyEffect::getFactory() const { } bool GrMorphologyEffect::onIsEqual(const GrEffect& sBase) const { - const GrMorphologyEffect& s = sBase.cast<GrMorphologyEffect>(); + const GrMorphologyEffect& s = CastEffect<GrMorphologyEffect>(sBase); return (this->texture(0) == s.texture(0) && this->radius() == s.radius() && this->direction() == s.direction() && |