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

src/gpu/batches/GrRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrRectBatch.h"
 
 #include "GrBatchTarget.h"
@@ skipping 62 matching lines @@
         GrColor* vertColor = reinterpret_cast<GrColor*>(offset + kColorOffset);
         for (int j = 0; j < 4; ++j) {
             *vertColor = geom.fColor;
             vertColor = (GrColor*) ((intptr_t) vertColor + vertexStride);
         }
     }
 
     helper.issueDraw(batchTarget);
 }
 
-bool GrRectBatch::onCombineIfPossible(GrBatch* t) {
-    if (!this->pipeline()->isEqual(*t->pipeline())) {
+bool GrRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
+                                caps)) {
         return false;
     }
 
     GrRectBatch* that = t->cast<GrRectBatch>();
 
     if (this->hasLocalRect() != that->hasLocalRect()) {
         return false;
     }
 
     SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
@@ skipping 70 matching lines @@
 
     geometry.fHasLocalMatrix = random->nextBool();
     if (geometry.fHasLocalMatrix) {
         geometry.fLocalMatrix = GrTest::TestMatrix(random);
     }
 
     return GrRectBatch::Create(geometry);
 }
 
 #endif