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/GrOvalEffect.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gpu/effects/GrOvalEffect.cpp') diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 3b373cbda7..1fb54aede3 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -23,8 +23,6 @@ public: const char* name() const override { return "Circle"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkPoint& getCenter() const { return fCenter; } @@ -35,6 +33,8 @@ public: private: CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -170,7 +170,7 @@ void GLCircleEffect::setData(const GrGLProgramDataManager& pdman, const GrProces /////////////////////////////////////////////////////////////////////////////////////////////////// -void CircleEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void CircleEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircleEffect::GenKey(*this, caps, b); } @@ -190,8 +190,6 @@ public: const char* name() const override { return "Ellipse"; } - void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const override; const SkPoint& getCenter() const { return fCenter; } @@ -202,6 +200,8 @@ public: private: EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); + void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override; @@ -345,7 +345,7 @@ void GLEllipseEffect::setData(const GrGLProgramDataManager& pdman, const GrProce /////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipseEffect::getGLProcessorKey(const GrGLSLCaps& caps, +void EllipseEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEllipseEffect::GenKey(*this, caps, b); } -- cgit v1.2.3