Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index 7a84f80805d9bf5cc6ab8c1b3d205f4525634343..4ae0ebc7efafc1089ea2e568c217d6d7240ca3d0 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -73,6 +73,11 @@ |
gCircleFillEdge->ref(); |
return gCircleFillEdge; |
} |
+ } |
+ |
+ virtual void getConstantColorComponents(GrColor* color, |
+ uint32_t* validFlags) const SK_OVERRIDE { |
+ *validFlags = 0; |
} |
const GrShaderVar& inCircleEdge() const { return fInCircleEdge; } |
@@ -145,11 +150,6 @@ |
return cee.fStroke == fStroke; |
} |
- virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE { |
- inout->fValidFlags = 0; |
- inout->fIsSingleComponent = false; |
- } |
- |
const GrShaderVar& fInCircleEdge; |
bool fStroke; |
@@ -190,6 +190,11 @@ |
gEllipseFillEdge->ref(); |
return gEllipseFillEdge; |
} |
+ } |
+ |
+ virtual void getConstantColorComponents(GrColor* color, |
+ uint32_t* validFlags) const SK_OVERRIDE { |
+ *validFlags = 0; |
} |
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE { |
@@ -286,11 +291,6 @@ |
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; |
@@ -339,6 +339,11 @@ |
gEllipseFillEdge->ref(); |
return gEllipseFillEdge; |
} |
+ } |
+ |
+ virtual void getConstantColorComponents(GrColor* color, |
+ uint32_t* validFlags) const SK_OVERRIDE { |
+ *validFlags = 0; |
} |
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE { |
@@ -453,11 +458,6 @@ |
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE { |
const DIEllipseEdgeEffect& eee = other.cast<DIEllipseEdgeEffect>(); |
return eee.fMode == fMode; |
- } |
- |
- virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE { |
- inout->fValidFlags = 0; |
- inout->fIsSingleComponent = false; |
} |
const GrShaderVar& fInEllipseOffsets0; |