diff options
author | bsalomon <bsalomon@google.com> | 2016-04-29 08:44:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-29 08:44:16 -0700 |
commit | 3de75da6d2cea525b0f2adadb3645b974107e4d0 (patch) | |
tree | a9bef71ad0a125cfbca482d50f41b7262672031b /src/gpu/GrPathRenderer.h | |
parent | b4d46f03db6080da4ad3b228d37e0760c1029015 (diff) |
Use constexpr constructors of GrStencilSettings rather than hacky macro system.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933053002
Review-Url: https://codereview.chromium.org/1933053002
Diffstat (limited to 'src/gpu/GrPathRenderer.h')
-rw-r--r-- | src/gpu/GrPathRenderer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h index cc149061ed..051e007852 100644 --- a/src/gpu/GrPathRenderer.h +++ b/src/gpu/GrPathRenderer.h @@ -265,13 +265,13 @@ private: * kStencilOnly in onGetStencilSupport(). */ virtual void onStencilPath(const StencilPathArgs& args) { - GR_STATIC_CONST_SAME_STENCIL(kIncrementStencil, - kReplace_StencilOp, - kReplace_StencilOp, - kAlways_StencilFunc, - 0xffff, - 0xffff, - 0xffff); + static constexpr GrStencilSettings kIncrementStencil( + kReplace_StencilOp, + kReplace_StencilOp, + kAlways_StencilFunc, + 0xffff, + 0xffff, + 0xffff); args.fPipelineBuilder->setStencil(kIncrementStencil); args.fPipelineBuilder->setDisableColorXPFactory(); DrawPathArgs drawArgs; |