Index: src/gpu/effects/GrBicubicEffect.cpp |
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp |
index d5cf03911b8536e636a9e7327c16518817696a8a..e3b959da4b277cad2de5291aa8f28a44aeb4f914 100644 |
--- a/src/gpu/effects/GrBicubicEffect.cpp |
+++ b/src/gpu/effects/GrBicubicEffect.cpp |
@@ -25,14 +25,15 @@ public: |
virtual void emitCode(EmitArgs&) override; |
- void setData(const GrGLProgramDataManager&, const GrProcessor&) override; |
- |
static inline void GenKey(const GrProcessor& effect, const GrGLSLCaps&, |
GrProcessorKeyBuilder* b) { |
const GrTextureDomain& domain = effect.cast<GrBicubicEffect>().domain(); |
b->add32(GrTextureDomain::GLDomain::DomainKey(domain)); |
} |
+protected: |
+ void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override; |
+ |
private: |
typedef GrGLProgramDataManager::UniformHandle UniformHandle; |
@@ -104,7 +105,7 @@ void GrGLBicubicEffect::emitCode(EmitArgs& args) { |
GrGLSLExpr4(args.fInputColor)).c_str()); |
} |
-void GrGLBicubicEffect::setData(const GrGLProgramDataManager& pdman, |
+void GrGLBicubicEffect::onSetData(const GrGLProgramDataManager& pdman, |
const GrProcessor& processor) { |
const GrBicubicEffect& bicubicEffect = processor.cast<GrBicubicEffect>(); |
const GrTexture& texture = *processor.texture(0); |
@@ -157,7 +158,7 @@ void GrBicubicEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, |
GrGLBicubicEffect::GenKey(*this, caps, b); |
} |
-GrGLFragmentProcessor* GrBicubicEffect::createGLInstance() const { |
+GrGLFragmentProcessor* GrBicubicEffect::onCreateGLInstance() const { |
return SkNEW_ARGS(GrGLBicubicEffect, (*this)); |
} |