| Index: src/gpu/effects/GrRRectEffect.cpp
|
| diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
|
| index f5131feba4bd3f7277378a2281694c9d021894d0..4d575477feb996a67dc692abbb5d3a34b33e9823 100644
|
| --- a/src/gpu/effects/GrRRectEffect.cpp
|
| +++ b/src/gpu/effects/GrRRectEffect.cpp
|
| @@ -59,8 +59,6 @@ public:
|
|
|
| typedef GLCircularRRectEffect GLProcessor;
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| @@ -68,6 +66,8 @@ private:
|
|
|
| virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
|
|
|
| + virtual void onComputeInvarientOutput(InvarientOutput* invarientOutput) const SK_OVERRIDE;
|
| +
|
| SkRRect fRRect;
|
| GrPrimitiveEdgeType fEdgeType;
|
| uint32_t fCircularCornerFlags;
|
| @@ -86,8 +86,9 @@ GrFragmentProcessor* CircularRRectEffect::Create(GrPrimitiveEdgeType edgeType,
|
| return SkNEW_ARGS(CircularRRectEffect, (edgeType, circularCornerFlags, rrect));
|
| }
|
|
|
| -void CircularRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| - *validFlags = 0;
|
| +void CircularRRectEffect::onComputeInvarientOutput(InvarientOutput* invarientOutput) const {
|
| + invarientOutput->validFlags = 0;
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendFragmentProcessorFactory& CircularRRectEffect::getFactory() const {
|
| @@ -399,8 +400,6 @@ public:
|
|
|
| typedef GLEllipticalRRectEffect GLProcessor;
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| @@ -408,6 +407,8 @@ private:
|
|
|
| virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
|
|
|
| + virtual void onComputeInvarientOutput(InvarientOutput* invarientOutput) const SK_OVERRIDE;
|
| +
|
| SkRRect fRRect;
|
| GrPrimitiveEdgeType fEdgeType;
|
|
|
| @@ -424,8 +425,9 @@ EllipticalRRectEffect::Create(GrPrimitiveEdgeType edgeType, const SkRRect& rrect
|
| return SkNEW_ARGS(EllipticalRRectEffect, (edgeType, rrect));
|
| }
|
|
|
| -void EllipticalRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| - *validFlags = 0;
|
| +void EllipticalRRectEffect::onComputeInvarientOutput(InvarientOutput* invarientOutput) const {
|
| + invarientOutput->validFlags = 0;
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendFragmentProcessorFactory& EllipticalRRectEffect::getFactory() const {
|
|
|