commit 1b6a43cf20d75b1ab6edb4c5d8de7fea88f78b9a
author Chris Dalton <csmartdalton@google.com> Fri Sep 25 12:21:18 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 25 21:12:50 2020 +0000
tree 12fe346e2c247b7efc1ebe64614c7adb95831454
parent aba2875aff6051735338bc9d84015a94ad349785

Move user stencil settings from GrPipeline to GrProgramInfo

Bug: skia:10419
Change-Id: If11d28f6d9348ba0011825f719123c09f0103603
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319481
Commit-Queue: Chris Dalton <csmartdalton@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 a16ee31..39e3f06 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -28,7 +28,6 @@
     }
 
     fWindowRectsState = hardClip.windowRectsState();
-    this->setUserStencil(args.fUserStencil);
 
     fXferProcessor = std::move(xferProcessor);
 
@@ -74,8 +73,7 @@
 GrPipeline::GrPipeline(GrScissorTest scissorTest,
                        sk_sp<const GrXferProcessor> xp,
                        const GrSwizzle& writeSwizzle,
-                       InputFlags inputFlags,
-                       const GrUserStencilSettings* userStencil)
+                       InputFlags inputFlags)
         : fWindowRectsState()
         , fFlags((Flags)inputFlags)
         , fXferProcessor(std::move(xp))
@@ -83,7 +81,6 @@
     if (GrScissorTest::kEnabled == scissorTest) {
         fFlags |= Flags::kScissorTestEnabled;
     }
-    this->setUserStencil(userStencil);
 }
 
 void GrPipeline::genKey(GrProcessorKeyBuilder* b, const GrCaps& caps) const {