diff options
| author |  bsalomon <bsalomon@google.com> | 2015-08-12 11:14:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-12 11:14:50 -0700 |
| commit | cb02b38b2c48bfde333ce3c699dd0451e2d867fa (patch) | |
| tree | fe4c1f40874588934ae4b07405dcdc9fc456bfa8 /src/gpu/batches/GrAAStrokeRectBatch.cpp | |
| parent | 6028a8476504022fe40b6870b1460b5e4a80969f (diff) | |
Check for xfer barriers in GrBatch, auto-issue barriers in GrGpu
Review URL: https://codereview.chromium.org/1287973003
Diffstat (limited to 'src/gpu/batches/GrAAStrokeRectBatch.cpp')
| -rw-r--r-- | src/gpu/batches/GrAAStrokeRectBatch.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |