| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index 4ae0ebc7efafc1089ea2e568c217d6d7240ca3d0..7a84f80805d9bf5cc6ab8c1b3d205f4525634343 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -75,11 +75,6 @@ public:
|
| }
|
| }
|
|
|
| - virtual void getConstantColorComponents(GrColor* color,
|
| - uint32_t* validFlags) const SK_OVERRIDE {
|
| - *validFlags = 0;
|
| - }
|
| -
|
| const GrShaderVar& inCircleEdge() const { return fInCircleEdge; }
|
|
|
| virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE {
|
| @@ -150,6 +145,11 @@ private:
|
| return cee.fStroke == fStroke;
|
| }
|
|
|
| + virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
|
| + inout->fValidFlags = 0;
|
| + inout->fIsSingleComponent = false;
|
| + }
|
| +
|
| const GrShaderVar& fInCircleEdge;
|
| bool fStroke;
|
|
|
| @@ -192,11 +192,6 @@ public:
|
| }
|
| }
|
|
|
| - virtual void getConstantColorComponents(GrColor* color,
|
| - uint32_t* validFlags) const SK_OVERRIDE {
|
| - *validFlags = 0;
|
| - }
|
| -
|
| virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE {
|
| return GrTBackendGeometryProcessorFactory<EllipseEdgeEffect>::getInstance();
|
| }
|
| @@ -291,6 +286,11 @@ private:
|
| return eee.fStroke == fStroke;
|
| }
|
|
|
| + virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
|
| + inout->fValidFlags = 0;
|
| + inout->fIsSingleComponent = false;
|
| + }
|
| +
|
| const GrShaderVar& fInEllipseOffset;
|
| const GrShaderVar& fInEllipseRadii;
|
| bool fStroke;
|
| @@ -341,11 +341,6 @@ public:
|
| }
|
| }
|
|
|
| - virtual void getConstantColorComponents(GrColor* color,
|
| - uint32_t* validFlags) const SK_OVERRIDE {
|
| - *validFlags = 0;
|
| - }
|
| -
|
| virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE {
|
| return GrTBackendGeometryProcessorFactory<DIEllipseEdgeEffect>::getInstance();
|
| }
|
| @@ -460,6 +455,11 @@ private:
|
| return eee.fMode == fMode;
|
| }
|
|
|
| + virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
|
| + inout->fValidFlags = 0;
|
| + inout->fIsSingleComponent = false;
|
| + }
|
| +
|
| const GrShaderVar& fInEllipseOffsets0;
|
| const GrShaderVar& fInEllipseOffsets1;
|
| Mode fMode;
|
|
|