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

src/gpu/batches/GrBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatch_DEFINED
 #define GrBatch_DEFINED
 
@@ skipping 36 matching lines @@
 
 class GrBatch : public GrNonAtomicRef {
 public:
     GrBatch();
     ~GrBatch() override;
 
     virtual const char* name() const = 0;
     virtual void getInvariantOutputColor(GrInitInvariantOutput* out) const = 0;
     virtual void getInvariantOutputCoverage(GrInitInvariantOutput* out) const = 0;
 
-    bool combineIfPossible(GrBatch* that) {
+    bool combineIfPossible(GrBatch* that, const GrCaps& caps) {
         if (this->classID() != that->classID()) {
             return false;
         }
 
-        return this->onCombineIfPossible(that);
+        return this->onCombineIfPossible(that, caps);
     }
 
-    virtual bool onCombineIfPossible(GrBatch*) = 0;
-
     virtual void generateGeometry(GrBatchTarget*) = 0;
 
     const SkRect& bounds() const { return fBounds; }
 
     // TODO this goes away when batches are everywhere
     void setNumberOfDraws(int numberOfDraws) { fNumberOfDraws = numberOfDraws; }
     int numberOfDraws() const { return fNumberOfDraws; }
 
     void* operator new(size_t size);
     void operator delete(void* target);
@@ skipping 78 matching lines @@
         using InstancedHelper::issueDraw;
 
     private:
         typedef InstancedHelper INHERITED;
     };
 
     uint32_t fClassID;
     SkRect fBounds;
 
 private:
+    virtual bool onCombineIfPossible(GrBatch*, const GrCaps& caps) = 0;
+
     /*
      * initBatchTracker is a hook for the some additional overrides / optimization possibilities
      * from the GrXferProcessor.
      */
     virtual void initBatchTracker(const GrPipelineOptimizations&) = 0;
 
 
     static uint32_t GenID(int32_t* idCounter) {
         // fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The
         // atomic inc returns the old value not the incremented value. So we add
@@ skipping 15 matching lines @@
     bool                                fPipelineInstalled;
 #if GR_BATCH_SPEW
     uint32_t                            fUniqueID;
     static int32_t gCurrBatchUniqueID;
 #endif
     static int32_t gCurrBatchClassID;
     typedef SkRefCnt INHERITED;
 };
 
 #endif