Index: src/gpu/batches/GrAAStrokeRectBatch.cpp |
diff --git a/src/gpu/batches/GrAAStrokeRectBatch.cpp b/src/gpu/batches/GrAAStrokeRectBatch.cpp |
index fa88fd13df6ca7134bb66726318d8fd1bb648ce4..0083aaad6c7a13ca90155bf50ed8b10084bf4227 100644 |
--- a/src/gpu/batches/GrAAStrokeRectBatch.cpp |
+++ b/src/gpu/batches/GrAAStrokeRectBatch.cpp |
@@ -203,8 +203,9 @@ const GrIndexBuffer* GrAAStrokeRectBatch::GetIndexBuffer(GrResourceProvider* res |
} |
} |
-bool GrAAStrokeRectBatch::onCombineIfPossible(GrBatch* t) { |
- if (!this->pipeline()->isEqual(*t->pipeline())) { |
+bool GrAAStrokeRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) { |
+ if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(), |
+ caps)) { |
return false; |
} |