| Index: src/gpu/batches/GrRectBatch.cpp
|
| diff --git a/src/gpu/batches/GrRectBatch.cpp b/src/gpu/batches/GrRectBatch.cpp
|
| index 1cfa0936130166fa9da3cb1df9d2b651aa0d07c7..1d5b9f305bcb35aab934ff27467079005177ec00 100644
|
| --- a/src/gpu/batches/GrRectBatch.cpp
|
| +++ b/src/gpu/batches/GrRectBatch.cpp
|
| @@ -80,8 +80,9 @@ void GrRectBatch::generateGeometry(GrBatchTarget* batchTarget) {
|
| helper.issueDraw(batchTarget);
|
| }
|
|
|
| -bool GrRectBatch::onCombineIfPossible(GrBatch* t) {
|
| - if (!this->pipeline()->isEqual(*t->pipeline())) {
|
| +bool GrRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
|
| + if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
|
| + caps)) {
|
| return false;
|
| }
|
|
|
|
|