| Index: src/gpu/effects/GrDashingEffect.cpp
|
| diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
|
| index 704a6ac3e67b39d0cc4644fa54a7d46cd86b3b6a..e84e9068c87c96f8a33961823ac28df3118ab220 100644
|
| --- a/src/gpu/effects/GrDashingEffect.cpp
|
| +++ b/src/gpu/effects/GrDashingEffect.cpp
|
| @@ -456,8 +456,6 @@ public:
|
|
|
| typedef GLDashingCircleEffect GLProcessor;
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| @@ -465,6 +463,8 @@ private:
|
|
|
| virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
|
|
|
| + virtual void onComputeInvarientOutput(InvarientOutput* invarientOutput) const SK_OVERRIDE;
|
| +
|
| GrPrimitiveEdgeType fEdgeType;
|
| const GrShaderVar& fInCoord;
|
| SkScalar fIntervalLength;
|
| @@ -584,8 +584,9 @@ GrGeometryProcessor* DashingCircleEffect::Create(GrPrimitiveEdgeType edgeType, c
|
|
|
| DashingCircleEffect::~DashingCircleEffect() {}
|
|
|
| -void DashingCircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| - *validFlags = 0;
|
| +void DashingCircleEffect::onComputeInvarientOutput(InvarientOutput* invarientOutput) const {
|
| + invarientOutput->validFlags = 0;
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendGeometryProcessorFactory& DashingCircleEffect::getFactory() const {
|
| @@ -668,8 +669,6 @@ public:
|
|
|
| typedef GLDashingLineEffect GLProcessor;
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| @@ -677,6 +676,8 @@ private:
|
|
|
| virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
|
|
|
| + virtual void onComputeInvarientOutput(InvarientOutput* invarientOutput) const SK_OVERRIDE;
|
| +
|
| GrPrimitiveEdgeType fEdgeType;
|
| const GrShaderVar& fInCoord;
|
| SkRect fRect;
|
| @@ -807,8 +808,9 @@ GrGeometryProcessor* DashingLineEffect::Create(GrPrimitiveEdgeType edgeType,
|
|
|
| DashingLineEffect::~DashingLineEffect() {}
|
|
|
| -void DashingLineEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| - *validFlags = 0;
|
| +void DashingLineEffect::onComputeInvarientOutput(InvarientOutput* invarientOutput) const {
|
| + invarientOutput->validFlags = 0;
|
| + invarientOutput->isSingleComponent = false;
|
| }
|
|
|
| const GrBackendGeometryProcessorFactory& DashingLineEffect::getFactory() const {
|
|
|