Simplify installation of pipeling into GrDrawBatch in GrDrawTarget.h

Simplify installation of pipeling into GrDrawBatch in GrDrawTarget

R=joshualitt@google.com

Committed: https://skia.googlesource.com/skia/+/ad792c1f39922a49c1e798311f47a9b3431eff32

[bsalomon, 2015-09-10 17:08:43]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-09-10 17:08:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1333943002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1333943002/1

[commit-bot: I haz the power, 2015-09-10 17:08:57]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-09-10 23:08 UTC

[joshualitt, 2015-09-10 17:17:05]

On 2015/09/10 17:08:57, commit-bot: I haz the power wrote:
> Note for Reviewers:
> The CQ is waiting for an approval.
> If you believe that the CL is not ready yet, or if you would like to L-G-T-M
> with comments then please uncheck the CQ checkbox.
> 
> Waiting for LGTM from valid reviewer(s) till 2015-09-10 23:08 UTC

lgtm

[commit-bot: I haz the power, 2015-09-10 17:17:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-10 17:17:41]

Failed to apply patch for src/gpu/GrDrawTarget.cpp:
While running git apply --index -3 -p1;
  error: patch failed: src/gpu/GrDrawTarget.cpp:159
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: src/gpu/GrDrawTarget.cpp: patch does not apply

Patch:       src/gpu/GrDrawTarget.cpp
Index: src/gpu/GrDrawTarget.cpp
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index
7eaa8bc76219f5ecbbec22a6747da1f651c6cdf6..1fd8babae763ec52c1defdf769b4e9bd49f698d7
100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -51,7 +51,7 @@ bool GrDrawTarget::setupDstReadIfNecessary(const
GrPipelineBuilder& pipelineBuil
                                            const GrProcOptInfo& colorPOI,
                                            const GrProcOptInfo& coveragePOI,
                                            GrXferProcessor::DstTexture*
dstTexture,
-                                           const SkRect* drawBounds) {
+                                           const SkRect& drawBounds) {
     if (!pipelineBuilder.willXPNeedDstTexture(*this->caps(), colorPOI,
coveragePOI)) {
         return true;
     }
@@ -71,20 +71,14 @@ bool GrDrawTarget::setupDstReadIfNecessary(const
GrPipelineBuilder& pipelineBuil
     SkIRect copyRect;
     pipelineBuilder.clip().getConservativeBounds(rt, &copyRect);
 
-    if (drawBounds) {
-        SkIRect drawIBounds;
-        drawBounds->roundOut(&drawIBounds);
-        if (!copyRect.intersect(drawIBounds)) {
+    SkIRect drawIBounds;
+    drawBounds.roundOut(&drawIBounds);
+    if (!copyRect.intersect(drawIBounds)) {
 #ifdef SK_DEBUG
-            GrCapsDebugf(fCaps, "Missed an early reject. "
-                         "Bailing on draw from setupDstReadIfNecessary.\n");
-#endif
-            return false;
-        }
-    } else {
-#ifdef SK_DEBUG
-        //SkDebugf("No dev bounds when dst copy is made.\n");
+        GrCapsDebugf(fCaps, "Missed an early reject. "
+                        "Bailing on draw from setupDstReadIfNecessary.\n");
 #endif
+        return false;
     }
 
     // MSAA consideration: When there is support for reading MSAA samples in
the shader we could
@@ -159,15 +153,11 @@ void GrDrawTarget::drawBatch(const GrPipelineBuilder&
pipelineBuilder, GrDrawBat
     SkRect bounds = batch->bounds();
     bounds.outset(0.5f, 0.5f);
 
-    GrDrawTarget::PipelineInfo pipelineInfo(&pipelineBuilder, &scissorState,
batch, &bounds,
-                                            this);
-
-    if (!pipelineInfo.valid()) {
-        return;
-    }
-    if (!batch->installPipeline(pipelineInfo.pipelineCreateArgs())) {
+    GrPipeline::CreateArgs args;
+    if (!this->installPipelineInDrawBatch(&pipelineBuilder, &scissorState,
batch)) {
         return;
     }
+
     this->recordBatch(batch);
 }
 
@@ -279,13 +269,8 @@ void GrDrawTarget::drawPathBatch(const GrPipelineBuilder&
pipelineBuilder,
     this->getPathStencilSettingsForFilltype(fill, sb, &stencilSettings);
     batch->setStencilSettings(stencilSettings);
 
-    GrDrawTarget::PipelineInfo pipelineInfo(&pipelineBuilder, &scissorState,
batch,
-                                            &batch->bounds(), this);
-
-    if (!pipelineInfo.valid()) {
-        return;
-    }
-    if (!batch->installPipeline(pipelineInfo.pipelineCreateArgs())) {
+    GrPipeline::CreateArgs args;
+    if (!this->installPipelineInDrawBatch(&pipelineBuilder, &scissorState,
batch)) {
         return;
     }
 
@@ -448,20 +433,26 @@ void GrDrawTarget::recordBatch(GrBatch* batch) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrDrawTarget::PipelineInfo::PipelineInfo(const GrPipelineBuilder*
pipelineBuilder,
-                                         const GrScissorState* scissor,
-                                         const GrDrawBatch* batch,
-                                         const SkRect* devBounds,
-                                         GrDrawTarget* target) {
-    fArgs.fPipelineBuilder = pipelineBuilder;
-    fArgs.fCaps = target->caps();
-    fArgs.fScissor = scissor;
-    fArgs.fColorPOI = fArgs.fPipelineBuilder->colorProcInfo(batch);
-    fArgs.fCoveragePOI = fArgs.fPipelineBuilder->coverageProcInfo(batch);
-    if (!target->setupDstReadIfNecessary(*fArgs.fPipelineBuilder,
fArgs.fColorPOI,
-                                         fArgs.fCoveragePOI,
&fArgs.fDstTexture, devBounds)) {
-        fArgs.fPipelineBuilder = nullptr;
+bool GrDrawTarget::installPipelineInDrawBatch(const GrPipelineBuilder*
pipelineBuilder,
+                                              const GrScissorState* scissor,
+                                              GrDrawBatch* batch) {
+    GrPipeline::CreateArgs args;
+    args.fPipelineBuilder = pipelineBuilder;
+    args.fCaps = this->caps();
+    args.fScissor = scissor;
+    args.fColorPOI = pipelineBuilder->colorProcInfo(batch);
+    args.fCoveragePOI = pipelineBuilder->coverageProcInfo(batch);
+    if (!this->setupDstReadIfNecessary(*pipelineBuilder, args.fColorPOI,
+                                       args.fCoveragePOI, &args.fDstTexture,
+                                       batch->bounds())) {
+        return false;
     }
+
+    if (!batch->installPipeline(args)) {
+        return false;
+    }
+
+    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////

[bsalomon, 2015-09-10 18:05:56]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2015-09-10 18:05:56]

The patchset sent to the CQ was uploaded after l-g-t-m from
joshualitt@google.com
Link to the patchset: https://codereview.chromium.org/1333943002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2015-09-10 18:06:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1333943002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1333943002/40001

[commit-bot: I haz the power, 2015-09-10 18:10:52]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/ad792c1f39922a49c1e798311f47a9b3431eff32