| Index: src/gpu/effects/GrOvalEffect.cpp
|
| diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
|
| index 16e1c099dd9f63818829348eaa9782932d0d4f4c..7d44fee6a299ce491a69f3e4082fae9f6d0faeb0 100644
|
| --- a/src/gpu/effects/GrOvalEffect.cpp
|
| +++ b/src/gpu/effects/GrOvalEffect.cpp
|
| @@ -33,9 +33,9 @@ public:
|
| private:
|
| CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius);
|
|
|
| - GrGLSLFragmentProcessor* onCreateGLInstance() const override;
|
| + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
|
|
|
| - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
|
|
| bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| @@ -174,12 +174,12 @@ void GLCircleEffect::onSetData(const GrGLSLProgramDataManager& pdman,
|
|
|
| ///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| -void CircleEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| +void CircleEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const {
|
| GLCircleEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLSLFragmentProcessor* CircleEffect::onCreateGLInstance() const {
|
| +GrGLSLFragmentProcessor* CircleEffect::onCreateGLSLInstance() const {
|
| return new GLCircleEffect(*this);
|
| }
|
|
|
| @@ -202,9 +202,9 @@ public:
|
| private:
|
| EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
|
|
|
| - GrGLSLFragmentProcessor* onCreateGLInstance() const override;
|
| + GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
|
|
|
| - void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
| + void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
|
|
| bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| @@ -351,12 +351,12 @@ void GLEllipseEffect::onSetData(const GrGLSLProgramDataManager& pdman,
|
|
|
| ///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| -void EllipseEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| +void EllipseEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const {
|
| GLEllipseEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLSLFragmentProcessor* EllipseEffect::onCreateGLInstance() const {
|
| +GrGLSLFragmentProcessor* EllipseEffect::onCreateGLSLInstance() const {
|
| return new GLEllipseEffect(*this);
|
| }
|
|
|
|
|