diff options
author | 2014-09-16 08:21:41 -0700 | |
---|---|---|
committer | 2014-09-16 08:21:42 -0700 | |
commit | 49586bec7383d4ccb81f85f8e2dc4162e2d4f6a8 (patch) | |
tree | 715c9fa39ab2e4b790c401f2c0399be200bbbfc8 /src/gpu/effects/GrMatrixConvolutionEffect.cpp | |
parent | 8a4c1030ff4b8336b5ac5b0712691e2f65383440 (diff) |
removing GrDrawEffect
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e
R=bsalomon@google.com
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/571163002
Diffstat (limited to 'src/gpu/effects/GrMatrixConvolutionEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrMatrixConvolutionEffect.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index b78c6379c8..4ba1895ca1 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -14,18 +14,18 @@ class GrGLMatrixConvolutionEffect : public GrGLEffect { public: GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory, - const GrDrawEffect& effect); + const GrEffect& effect); virtual void emitCode(GrGLProgramBuilder*, - const GrDrawEffect&, + const GrEffect&, const GrEffectKey&, const char* outputColor, const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); + static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE; + virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE; private: typedef GrGLProgramDataManager::UniformHandle UniformHandle; @@ -44,22 +44,22 @@ private: }; GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory, - const GrDrawEffect& drawEffect) + const GrEffect& effect) : INHERITED(factory) { - const GrMatrixConvolutionEffect& m = drawEffect.castEffect<GrMatrixConvolutionEffect>(); + const GrMatrixConvolutionEffect& m = effect.cast<GrMatrixConvolutionEffect>(); fKernelSize = m.kernelSize(); fConvolveAlpha = m.convolveAlpha(); } void GrGLMatrixConvolutionEffect::emitCode(GrGLProgramBuilder* builder, - const GrDrawEffect& drawEffect, + const GrEffect& effect, const GrEffectKey& key, const char* outputColor, const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) { sk_ignore_unused_variable(inputColor); - const GrTextureDomain& domain = drawEffect.castEffect<GrMatrixConvolutionEffect>().domain(); + const GrTextureDomain& domain = effect.cast<GrMatrixConvolutionEffect>().domain(); fBoundsUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec4f_GrSLType, "Bounds"); @@ -120,9 +120,9 @@ void GrGLMatrixConvolutionEffect::emitCode(GrGLProgramBuilder* builder, fsBuilder->codeAppend(modulate.c_str()); } -void GrGLMatrixConvolutionEffect::GenKey(const GrDrawEffect& drawEffect, +void GrGLMatrixConvolutionEffect::GenKey(const GrEffect& effect, const GrGLCaps&, GrEffectKeyBuilder* b) { - const GrMatrixConvolutionEffect& m = drawEffect.castEffect<GrMatrixConvolutionEffect>(); + const GrMatrixConvolutionEffect& m = effect.cast<GrMatrixConvolutionEffect>(); SkASSERT(m.kernelSize().width() <= 0x7FFF && m.kernelSize().height() <= 0xFFFF); uint32_t key = m.kernelSize().width() << 16 | m.kernelSize().height(); key |= m.convolveAlpha() ? 1 << 31 : 0; @@ -131,8 +131,8 @@ void GrGLMatrixConvolutionEffect::GenKey(const GrDrawEffect& drawEffect, } void GrGLMatrixConvolutionEffect::setData(const GrGLProgramDataManager& pdman, - const GrDrawEffect& drawEffect) { - const GrMatrixConvolutionEffect& conv = drawEffect.castEffect<GrMatrixConvolutionEffect>(); + const GrEffect& effect) { + const GrMatrixConvolutionEffect& conv = effect.cast<GrMatrixConvolutionEffect>(); GrTexture& texture = *conv.texture(0); // the code we generated was for a specific kernel size SkASSERT(conv.kernelSize() == fKernelSize); @@ -178,7 +178,7 @@ const GrBackendEffectFactory& GrMatrixConvolutionEffect::getFactory() const { } bool GrMatrixConvolutionEffect::onIsEqual(const GrEffect& sBase) const { - const GrMatrixConvolutionEffect& s = CastEffect<GrMatrixConvolutionEffect>(sBase); + const GrMatrixConvolutionEffect& s = sBase.cast<GrMatrixConvolutionEffect>(); return this->texture(0) == s.texture(0) && fKernelSize == s.kernelSize() && !memcmp(fKernel, s.kernel(), |