Separate user and raw stencil settings

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index c5d61d87cbf9ae99049503b1dbff4be1b2b80302..3cbc76cab7ef2a61688685500d074366f41503e0 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -277,25 +277,29 @@ static void set_random_state(GrPipelineBuilder* pipelineBuilder, SkRandom* rando
 
 // right now, the only thing we seem to care about in drawState's stencil is 'doesWrite()'
 static void set_random_stencil(GrPipelineBuilder* pipelineBuilder, SkRandom* random) {
-    static constexpr GrStencilSettings kDoesWriteStencil(
-         kReplace_StencilOp,
-         kReplace_StencilOp,
-         kAlways_StencilFunc,
-         0xffff,
-         0xffff,
-         0xffff);
-    static constexpr GrStencilSettings kDoesNotWriteStencil(
-         kKeep_StencilOp,
-         kKeep_StencilOp,
-         kNever_StencilFunc,
-         0xffff,
-         0xffff,
-         0xffff);
+    static constexpr GrUserStencilSettings kDoesWriteStencil(
+        GrUserStencilSettings::StaticInit<
+            0xffff,
+            GrUserStencilTest::kAlways,
+            0xffff,
+            GrUserStencilOp::kReplace,
+            GrUserStencilOp::kReplace,
+            0xffff>()
+    );
+    static constexpr GrUserStencilSettings kDoesNotWriteStencil(
+        GrUserStencilSettings::StaticInit<
+            0xffff,
+            GrUserStencilTest::kNever,
+            0xffff,
+            GrUserStencilOp::kKeep,
+            GrUserStencilOp::kKeep,
+            0xffff>()
+    );
 
     if (random->nextBool()) {
-        pipelineBuilder->setStencil(kDoesWriteStencil);
+        pipelineBuilder->setUserStencil(&kDoesWriteStencil);
     } else {
-        pipelineBuilder->setStencil(kDoesNotWriteStencil);
+        pipelineBuilder->setUserStencil(&kDoesNotWriteStencil);
     }
 }