| Index: src/gpu/effects/GrDashingEffect.cpp
|
| diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
|
| index 71f4e8d19b67ff65c1159948d534a2109a8c817b..6a894f9e0e6ec8c8f681e0394433ea58528eebb8 100644
|
| --- a/src/gpu/effects/GrDashingEffect.cpp
|
| +++ b/src/gpu/effects/GrDashingEffect.cpp
|
| @@ -617,8 +617,9 @@ private:
|
| combinedMatrix.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;
|
| }
|
|
|
|
|