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/GrOpsRenderPass.cpp

diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index cd329de..4dde2cc 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -77,8 +77,8 @@
          SkASSERT(this->gpu()->caps()->wireframeSupport());
     }
     if (this->gpu()->caps()->twoSidedStencilRefsAndMasksMustMatch() &&
-        programInfo.pipeline().isStencilEnabled()) {
-        const GrUserStencilSettings* stencil = programInfo.pipeline().getUserStencil();
+        programInfo.isStencilEnabled()) {
+        const GrUserStencilSettings* stencil = programInfo.userStencilSettings();
         if (stencil->isTwoSided(programInfo.pipeline().hasStencilClip())) {
             SkASSERT(stencil->fCCWFace.fRef == stencil->fCWFace.fRef);
             SkASSERT(stencil->fCCWFace.fTestMask == stencil->fCWFace.fTestMask);