| Index: src/gpu/GrAAHairLinePathRenderer.cpp
|
| diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
|
| index 1a3318b887b96b64323a7f161c563cc0d9ade1d9..df0095eaba6e07cc390fdad29affdb3a5fa77fdf 100644
|
| --- a/src/gpu/GrAAHairLinePathRenderer.cpp
|
| +++ b/src/gpu/GrAAHairLinePathRenderer.cpp
|
| @@ -731,8 +731,9 @@ private:
|
| fBounds.outset(0.5f, 0.5f);
|
| }
|
|
|
| - 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;
|
| }
|
|
|
|
|