Use texture barriers to read directly from the RT

src/gpu/GrTargetCommands.cpp

Index: src/gpu/GrTargetCommands.cpp
diff --git a/src/gpu/GrTargetCommands.cpp b/src/gpu/GrTargetCommands.cpp
index c448db95b64a1bd56da6eb53b7cacc6e09782dbc..01c549c2944425fd11141db60ca2c0970e655bdb 100644
--- a/src/gpu/GrTargetCommands.cpp
+++ b/src/gpu/GrTargetCommands.cpp
@@ -341,6 +341,10 @@ void GrTargetCommands::CopySurface::execute(GrGpu* gpu, const SetState*) {
     gpu->copySurface(this->dst(), this->src(), fSrcRect, fDstPoint);
 }
 
+void GrTargetCommands::XferBarrier::execute(GrGpu* gpu, const SetState* state) {
+    gpu->setXferBarrier(fBarrierType);
+}
+
 GrTargetCommands::Cmd* GrTargetCommands::recordCopySurface(GrSurface* dst,
                                                            GrSurface* src,
                                                            const SkIRect& srcRect,
@@ -375,6 +379,8 @@ bool GrTargetCommands::setupPipelineAndShouldDraw(GrInOrderDrawBuffer* iodb,
         fPrevState = ss;
         iodb->recordTraceMarkersIfNecessary(ss);
     }
+
+    this->recordXferBarrierIfNecessary(iodb, pipelineInfo);
     return true;
 }
 
@@ -398,6 +404,25 @@ bool GrTargetCommands::setupPipelineAndShouldDraw(GrInOrderDrawBuffer* iodb,
         fPrevState = ss;
         iodb->recordTraceMarkersIfNecessary(ss);
     }
+
+    this->recordXferBarrierIfNecessary(iodb, pipelineInfo);
     return true;
 }
 
+void GrTargetCommands::recordXferBarrierIfNecessary(GrInOrderDrawBuffer* iodb,
+                                                    const GrDrawTarget::PipelineInfo& info) {
+    SkASSERT(fPrevState);
+    const GrXferProcessor& xp = *fPrevState->getXferProcessor();
+    GrRenderTarget* rt = fPrevState->getRenderTarget();
+
+    GrXferBarrierType barrierType;
+    if (!xp.willNeedXferBarrier(rt, *iodb->caps(), &barrierType)) {
+        return;
+    }
+

[Chris Dalton, 2015/04/29 18:42:02]

This part of the rebase was nontrivial. I removed the call to this->closeBatch()

+    XferBarrier* xb = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, XferBarrier, ());
+    xb->fBarrierType = barrierType;
+
+    iodb->recordTraceMarkersIfNecessary(xb);
+}
+