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

src/gpu/GrXferProcessor.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 "GrXferProcessor.h"
 #include "GrPipelineBuilder.h"
 #include "GrProcOptInfo.h"
@@ skipping 75 matching lines @@
             key |= 0x8;
         }
         if (this->dstReadUsesMixedSamples()) {
             key |= 0x10;
         }
     }
     b->add32(key);
     this->onGetGLProcessorKey(caps, b);
 }
 
-bool GrXferProcessor::willNeedXferBarrier(const GrRenderTarget* rt,
-                                          const GrCaps& caps,
-                                          GrXferBarrierType* outBarrierType) const {
+GrXferBarrierType GrXferProcessor::xferBarrierType(const GrRenderTarget* rt,
+                                                   const GrCaps& caps) const {
+    SkASSERT(rt);
     if (static_cast<const GrSurface*>(rt) == this->getDstTexture()) {
         // Texture barriers are required when a shader reads and renders to the same texture.
-        SkASSERT(rt);
         SkASSERT(caps.textureBarrierSupport());
-        *outBarrierType = kTexture_GrXferBarrierType;
-        return true;
+        return kTexture_GrXferBarrierType;
     }
-    return this->onWillNeedXferBarrier(rt, caps, outBarrierType);
+    return this->onXferBarrier(rt, caps);
 }
 
 #ifdef SK_DEBUG
 static const char* equation_string(GrBlendEquation eq) {
     switch (eq) {
         case kAdd_GrBlendEquation:
             return "add";
         case kSubtract_GrBlendEquation:
             return "subtract";
         case kReverseSubtract_GrBlendEquation:
@@ skipping 105 matching lines @@
     return this->onCreateXferProcessor(caps, colorPOI, coveragePOI, hasMixedSamples, dstTexture);
 }
 
 bool GrXPFactory::willNeedDstTexture(const GrCaps& caps,
                                      const GrProcOptInfo& colorPOI,
                                      const GrProcOptInfo& coveragePOI,
                                      bool hasMixedSamples) const {
     return (this->willReadDstColor(caps, colorPOI, coveragePOI, hasMixedSamples) &&
             !caps.shaderCaps()->dstReadInShaderSupport());
 }