Index: src/gpu/GrAADistanceFieldPathRenderer.cpp |
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp |
index 1858f000e46e5e54b4c4faaed90e35f4fb70d259..0428373a893c54038b97a048fc30c84dfdeb90b4 100755 |
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp |
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp |
@@ -492,8 +492,9 @@ private: |
const SkMatrix& viewMatrix() const { return fBatch.fViewMatrix; } |
bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; } |
- bool onCombineIfPossible(GrBatch* t) override { |
- if (!this->pipeline()->isEqual(*t->pipeline())) { |
+ bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { |
+ if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(), |
+ caps)) { |
return false; |
} |