From 4b3050b410254d0cb38df9a30ae2e209124fa1a2 Mon Sep 17 00:00:00 2001 From: wangyix Date: Tue, 4 Aug 2015 07:59:37 -0700 Subject: Added registerChild; transforms, textures, glKey automatically handled. BUG=skia: Review URL: https://codereview.chromium.org/1266633003 --- src/gpu/effects/GrRRectEffect.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gpu/effects/GrRRectEffect.cpp') diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index dcc8944a23..271a997065 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -49,8 +49,6 @@ public: const char* name() const override { return "CircularRRect"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -62,6 +60,8 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -361,7 +361,7 @@ void GLCircularRRectEffect::setData(const GrGLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void CircularRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircularRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircularRRectEffect::GenKey(*this, caps, b); } @@ -380,8 +380,6 @@ public: const char* name() const override { return "EllipticalRRect"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -391,6 +389,8 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor& other) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -609,7 +609,7 @@ void GLEllipticalRRectEffect::setData(const GrGLProgramDataManager& pdman, //////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipticalRRectEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void EllipticalRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEllipticalRRectEffect::GenKey(*this, caps, b); } -- cgit v1.2.3