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/gpu/effects/GrConvolutionEffect.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/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index b0abdcf9ed..90a655c920 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -17,19 +17,19 @@ typedef GrGLProgramDataManager::UniformHandle UniformHandle; class GrGLConvolutionEffect : public GrGLEffect { public: - GrGLConvolutionEffect(const GrBackendEffectFactory&, const GrEffect&); + GrGLConvolutionEffect(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& pdman, const GrEffect&) SK_OVERRIDE; + virtual void setData(const GrGLProgramDataManager& pdman, const GrDrawEffect&) SK_OVERRIDE; - static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*); + static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); private: int width() const { return Gr1DKernelEffect::WidthFromRadius(fRadius); } @@ -47,16 +47,16 @@ private: }; GrGLConvolutionEffect::GrGLConvolutionEffect(const GrBackendEffectFactory& factory, - const GrEffect& effect) + const GrDrawEffect& drawEffect) : INHERITED(factory) { - const GrConvolutionEffect& c = effect.cast<GrConvolutionEffect>(); + const GrConvolutionEffect& c = drawEffect.castEffect<GrConvolutionEffect>(); fRadius = c.radius(); fUseBounds = c.useBounds(); fDirection = c.direction(); } void GrGLConvolutionEffect::emitCode(GrGLProgramBuilder* builder, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey& key, const char* outputColor, const char* inputColor, @@ -106,8 +106,8 @@ void GrGLConvolutionEffect::emitCode(GrGLProgramBuilder* builder, } void GrGLConvolutionEffect::setData(const GrGLProgramDataManager& pdman, - const GrEffect& effect) { - const GrConvolutionEffect& conv = effect.cast<GrConvolutionEffect>(); + const GrDrawEffect& drawEffect) { + const GrConvolutionEffect& conv = drawEffect.castEffect<GrConvolutionEffect>(); GrTexture& texture = *conv.texture(0); // the code we generated was for a specific kernel radius SkASSERT(conv.radius() == fRadius); @@ -136,9 +136,9 @@ void GrGLConvolutionEffect::setData(const GrGLProgramDataManager& pdman, pdman.set1fv(fKernelUni, this->width(), conv.kernel()); } -void GrGLConvolutionEffect::GenKey(const GrEffect& effect, const GrGLCaps&, +void GrGLConvolutionEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) { - const GrConvolutionEffect& conv = effect.cast<GrConvolutionEffect>(); + const GrConvolutionEffect& conv = drawEffect.castEffect<GrConvolutionEffect>(); uint32_t key = conv.radius(); key <<= 2; if (conv.useBounds()) { @@ -201,7 +201,7 @@ const GrBackendEffectFactory& GrConvolutionEffect::getFactory() const { } bool GrConvolutionEffect::onIsEqual(const GrEffect& sBase) const { - const GrConvolutionEffect& s = sBase.cast<GrConvolutionEffect>(); + const GrConvolutionEffect& s = CastEffect<GrConvolutionEffect>(sBase); return (this->texture(0) == s.texture(0) && this->radius() == s.radius() && this->direction() == s.direction() && |