Index: src/gpu/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp |
index 9850ddc48cdff100a7ba52840d7b0b0dd04abc6b..3d2ff456d71f3c570a943c7f843ef7f9017e5a7a 100644 |
--- a/src/gpu/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/GrAAConvexPathRenderer.cpp |
@@ -940,8 +940,9 @@ private: |
geometry.fViewMatrix.mapRect(&fBounds); |
} |
- 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; |
} |