| Index: src/gpu/GrAAConvexPathRenderer.cpp
|
| diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
|
| index c68410fc6ac59dc43b9d9fc06e623b3e24b6bdd9..649d04166e06f920017e08d60b478d93c83e03b3 100644
|
| --- a/src/gpu/GrAAConvexPathRenderer.cpp
|
| +++ b/src/gpu/GrAAConvexPathRenderer.cpp
|
| @@ -641,17 +641,6 @@ public:
|
| local->fUsesLocalCoords = init.fUsesLocalCoords;
|
| }
|
|
|
| - bool onCanMakeEqual(const GrBatchTracker& m,
|
| - const GrGeometryProcessor& that,
|
| - const GrBatchTracker& t) const override {
|
| - const BatchTracker& mine = m.cast<BatchTracker>();
|
| - const BatchTracker& theirs = t.cast<BatchTracker>();
|
| - return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords,
|
| - that, theirs.fUsesLocalCoords) &&
|
| - CanCombineOutput(mine.fInputColorType, mine.fColor,
|
| - theirs.fInputColorType, theirs.fColor);
|
| - }
|
| -
|
| private:
|
| QuadEdgeEffect(GrColor color, const SkMatrix& localMatrix)
|
| : INHERITED(color, SkMatrix::I(), localMatrix) {
|
| @@ -660,14 +649,6 @@ private:
|
| fInQuadEdge = &this->addVertexAttrib(Attribute("inQuadEdge", kVec4f_GrVertexAttribType));
|
| }
|
|
|
| - bool onIsEqual(const GrGeometryProcessor& other) const override {
|
| - return true;
|
| - }
|
| -
|
| - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownSingleComponent();
|
| - }
|
| -
|
| struct BatchTracker {
|
| GrGPInput fInputColorType;
|
| GrColor fColor;
|
| @@ -747,8 +728,7 @@ static const GrGeometryProcessor* create_fill_gp(bool tweakAlphaForCoverage,
|
| flags |= GrDefaultGeoProcFactory::kCoverage_GPType;
|
| }
|
|
|
| - return GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, SkMatrix::I(), localMatrix,
|
| - false, 0xff);
|
| + return GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, SkMatrix::I(), localMatrix);
|
| }
|
|
|
| class AAConvexPathBatch : public GrBatch {
|
|
|