Index: src/gpu/batches/GrStencilAndCoverPathRenderer.cpp |
diff --git a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp |
index d50111be47e9d5383929a44b0f4a63b85e243de2..4aaea849578a68c79a3eddf617bb8887a1156e51 100644 |
--- a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp |
+++ b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp |
@@ -88,7 +88,7 @@ bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) { |
SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, *args.fStroke)); |
if (path.isInverseFillType()) { |
- GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass, |
+ static constexpr GrStencilSettings kInvertedStencilPass( |
kKeep_StencilOp, |
kZero_StencilOp, |
// We know our rect will hit pixels outside the clip and the user bits will be 0 |
@@ -131,7 +131,7 @@ bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) { |
&invert)); |
args.fTarget->drawBatch(*pipelineBuilder, batch); |
} else { |
- GR_STATIC_CONST_SAME_STENCIL(kStencilPass, |
+ static constexpr GrStencilSettings kStencilPass( |
kZero_StencilOp, |
kKeep_StencilOp, |
kNotEqual_StencilFunc, |