| Index: src/gpu/effects/GrRRectEffect.cpp
|
| diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
|
| index 8b3b83dda8dd3ce76a69057cf7892df0858d9912..c5c5efdd0e4b1b41756d8ba23adf7ddc41d9c96b 100644
|
| --- a/src/gpu/effects/GrRRectEffect.cpp
|
| +++ b/src/gpu/effects/GrRRectEffect.cpp
|
| @@ -60,9 +60,9 @@ public:
|
| private:
|
| CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&);
|
|
|
| - 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& other) const override;
|
|
|
| @@ -364,12 +364,12 @@ void GLCircularRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman,
|
|
|
| ////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| -void CircularRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| +void CircularRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const {
|
| GLCircularRRectEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLInstance() const {
|
| +GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLSLInstance() const {
|
| return new GLCircularRRectEffect(*this);
|
| }
|
|
|
| @@ -390,9 +390,9 @@ public:
|
| private:
|
| EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&);
|
|
|
| - 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& other) const override;
|
|
|
| @@ -615,12 +615,12 @@ void GLEllipticalRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman,
|
|
|
| ////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| -void EllipticalRRectEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const {
|
| +void EllipticalRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const {
|
| GLEllipticalRRectEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| -GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLInstance() const {
|
| +GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLSLInstance() const {
|
| return new GLEllipticalRRectEffect(*this);
|
| }
|
|
|
|
|