| Index: src/gpu/batches/GrStrokeRectBatch.h
|
| diff --git a/src/gpu/batches/GrStrokeRectBatch.h b/src/gpu/batches/GrStrokeRectBatch.h
|
| index 3a20d9bfcb73a30c733e6f6b34df2f2aaa8277bd..7979a6492d856ae5bee0e774520da8eee421f8a0 100644
|
| --- a/src/gpu/batches/GrStrokeRectBatch.h
|
| +++ b/src/gpu/batches/GrStrokeRectBatch.h
|
| @@ -50,10 +50,11 @@ private:
|
| bool hairline() const { return fBatch.fHairline; }
|
| bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
|
|
|
| - bool onCombineIfPossible(GrBatch* t) override {
|
| - //if (!this->pipeline()->isEqual(*t->pipeline())) {
|
| - // return false;
|
| - //}
|
| + bool onCombineIfPossible(GrBatch* t, const GrCaps&) override {
|
| + // if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(),
|
| + // t->bounds(), caps)) {
|
| + // return false;
|
| + // }
|
| // GrStrokeRectBatch* that = t->cast<StrokeRectBatch>();
|
|
|
| // NonAA stroke rects cannot batch right now
|
|
|