Index: src/gpu/batches/GrDrawVerticesBatch.cpp |
diff --git a/src/gpu/batches/GrDrawVerticesBatch.cpp b/src/gpu/batches/GrDrawVerticesBatch.cpp |
index 397bb2b8f1587499803071db8f6705f4fa1bf4b1..f36c54b067f1d18f14de02cb164e294ba7f9eaf6 100644 |
--- a/src/gpu/batches/GrDrawVerticesBatch.cpp |
+++ b/src/gpu/batches/GrDrawVerticesBatch.cpp |
@@ -183,8 +183,9 @@ void GrDrawVerticesBatch::generateGeometry(GrBatchTarget* batchTarget) { |
batchTarget->draw(vertices); |
} |
-bool GrDrawVerticesBatch::onCombineIfPossible(GrBatch* t) { |
- if (!this->pipeline()->isEqual(*t->pipeline())) { |
+bool GrDrawVerticesBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) { |
+ if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(), |
+ caps)) { |
return false; |
} |