From cb02b38b2c48bfde333ce3c699dd0451e2d867fa Mon Sep 17 00:00:00 2001 From: bsalomon Date: Wed, 12 Aug 2015 11:14:50 -0700 Subject: Check for xfer barriers in GrBatch, auto-issue barriers in GrGpu Review URL: https://codereview.chromium.org/1287973003 --- src/gpu/batches/GrAAFillRectBatch.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu/batches/GrAAFillRectBatch.cpp') diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp index 582d2e8e04..73a0c4bad7 100644 --- a/src/gpu/batches/GrAAFillRectBatch.cpp +++ b/src/gpu/batches/GrAAFillRectBatch.cpp @@ -130,7 +130,6 @@ public: args.fDevRect, canTweakAlphaForCoverage); } - helper.issueDraw(batchTarget); } @@ -176,8 +175,9 @@ private: const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; } bool coverageIgnored() const { return fBatch.fCoverageIgnored; } - bool onCombineIfPossible(GrBatch* t) override { - if (!this->pipeline()->isEqual(*t->pipeline())) { + bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) { + if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(), + caps)) { return false; } -- cgit v1.2.3