commit bfd18cdd5421b6fac063bd07a96a5b9b1afa6a88
author Brian Salomon <bsalomon@google.com> Wed Aug 09 16:27:09 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 10 12:54:05 2017 +0000
tree 122c5d36cc5e8aef3232ec822540262d64007ae6
parent 65048139bd26c8edbc6796f220e79b6c848151d7

Move GrAppliedClip into GrPipeline

Change-Id: I522c2fd52bea9813baba7cdb3f11b63e7ab96b50
Reviewed-on: https://skia-review.googlesource.com/28861
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index f684896..a6e8fba 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -17,20 +17,19 @@
 
 #include "ops/GrOp.h"
 
-GrPipeline::GrPipeline(const InitArgs& args, GrProcessorSet&& processors) {
+GrPipeline::GrPipeline(const InitArgs& args, GrProcessorSet&& processors,
+                       GrAppliedClip&& appliedClip) {
     SkASSERT(args.fProxy);
     SkASSERT(processors.isFinalized());
 
     fProxy.reset(args.fProxy);
 
     fFlags = args.fFlags;
-    if (args.fAppliedClip) {
-        fScissorState = args.fAppliedClip->scissorState();
-        if (args.fAppliedClip->hasStencilClip()) {
-            fFlags |= kHasStencilClip_Flag;
-        }
-        fWindowRectsState = args.fAppliedClip->windowRectsState();
+    fScissorState = appliedClip.scissorState();
+    if (appliedClip.hasStencilClip()) {
+        fFlags |= kHasStencilClip_Flag;
     }
+    fWindowRectsState = appliedClip.windowRectsState();
     if (!args.fUserStencil->isDisabled(fFlags & kHasStencilClip_Flag)) {
         fFlags |= kStencilEnabled_Flag;
     }
@@ -52,7 +51,8 @@
     fNumColorProcessors = processors.numColorFragmentProcessors();
     int numTotalProcessors =
             fNumColorProcessors + processors.numCoverageFragmentProcessors();
-    if (args.fAppliedClip && args.fAppliedClip->clipCoverageFragmentProcessor()) {
+    auto clipFP = appliedClip.detachClipCoverageFragmentProcessor();
+    if (clipFP) {
         ++numTotalProcessors;
     }
     fFragmentProcessors.reset(numTotalProcessors);
@@ -72,12 +72,10 @@
             this->markAsBad();
         }
     }
-    if (args.fAppliedClip) {
-        if (const GrFragmentProcessor* fp = args.fAppliedClip->clipCoverageFragmentProcessor()) {
-            fFragmentProcessors[currFPIdx].reset(fp);
-            if (!fp->instantiate(args.fResourceProvider)) {
-                this->markAsBad();
-            }
+    if (clipFP) {
+        fFragmentProcessors[currFPIdx].reset(clipFP.get());
+        if (!fFragmentProcessors[currFPIdx]->instantiate(args.fResourceProvider)) {
+            this->markAsBad();
         }
     }
 }