| Index: src/gpu/effects/GrOvalEffect.cpp
|
| diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
|
| index 2a04e16611feb6e39a1a896961ad7002500e3bc1..10fd8a6bf41768bf3b63e0929eb3e2ecb40ba052 100644
|
| --- a/src/gpu/effects/GrOvalEffect.cpp
|
| +++ b/src/gpu/effects/GrOvalEffect.cpp
|
| @@ -32,14 +32,14 @@
|
|
|
| typedef GLCircleEffect GLProcessor;
|
|
|
| + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| +
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius);
|
|
|
| virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;
|
| -
|
| - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| SkPoint fCenter;
|
| SkScalar fRadius;
|
| @@ -56,9 +56,8 @@
|
| return SkNEW_ARGS(CircleEffect, (edgeType, center, radius));
|
| }
|
|
|
| -void CircleEffect::onComputeInvariantOutput(InvariantOutput* inout) const {
|
| - inout->fValidFlags = 0;
|
| - inout->fIsSingleComponent = false;
|
| +void CircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| + *validFlags = 0;
|
| }
|
|
|
| const GrBackendFragmentProcessorFactory& CircleEffect::getFactory() const {
|
| @@ -205,14 +204,14 @@
|
|
|
| typedef GLEllipseEffect GLProcessor;
|
|
|
| + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| +
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
|
|
|
| virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;
|
| -
|
| - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| SkPoint fCenter;
|
| SkVector fRadii;
|
| @@ -231,9 +230,8 @@
|
| return SkNEW_ARGS(EllipseEffect, (edgeType, center, rx, ry));
|
| }
|
|
|
| -void EllipseEffect::onComputeInvariantOutput(InvariantOutput* inout) const {
|
| - inout->fValidFlags = 0;
|
| - inout->fIsSingleComponent = false;
|
| +void EllipseEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| + *validFlags = 0;
|
| }
|
|
|
| const GrBackendFragmentProcessorFactory& EllipseEffect::getFactory() const {
|
|
|