commit cb02b38b2c48bfde333ce3c699dd0451e2d867fa
author bsalomon <bsalomon@google.com> Wed Aug 12 11:14:50 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 12 11:14:50 2015 -0700
tree fe4c1f40874588934ae4b07405dcdc9fc456bfa8
parent 6028a8476504022fe40b6870b1460b5e4a80969f

Check for xfer barriers in GrBatch, auto-issue barriers in GrGpu

Review URL: https://codereview.chromium.org/1287973003

src/gpu/GrAtlasTextContext.cpp

diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index f33e2f9..4337d81 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -1893,8 +1893,9 @@
     bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
     int numGlyphs() const { return fBatch.fNumGlyphs; }
 
-    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;
         }