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/GrAAStrokeRectBatch.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gpu/batches/GrAAStrokeRectBatch.cpp') diff --git a/src/gpu/batches/GrAAStrokeRectBatch.cpp b/src/gpu/batches/GrAAStrokeRectBatch.cpp index fa88fd13df..0083aaad6c 100644 --- a/src/gpu/batches/GrAAStrokeRectBatch.cpp +++ b/src/gpu/batches/GrAAStrokeRectBatch.cpp @@ -203,8 +203,9 @@ const GrIndexBuffer* GrAAStrokeRectBatch::GetIndexBuffer(GrResourceProvider* res } } -bool GrAAStrokeRectBatch::onCombineIfPossible(GrBatch* t) { - if (!this->pipeline()->isEqual(*t->pipeline())) { +bool GrAAStrokeRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) { + if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(), + caps)) { return false; } -- cgit v1.2.3