diff options
| author |  cdalton <cdalton@nvidia.com> | 2016-05-10 14:23:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-10 14:23:01 -0700 |
| commit | 12dbb3947e1aaf205b4fcf13b40e54e50650eb37 (patch) | |
| tree | b5f94e96f154882abce1ba1793e2ad45b8fef8d9 /src/gpu/text/GrStencilAndCoverTextContext.cpp | |
| parent | 554784cd85029c05d9ed04b1aeb71520d196153a (diff) | |
Separate user and raw stencil settings
Adds a new GrUserStencilSettings class that describes in abstract terms
how a draw will use the stencil (e.g. kAlwaysIfInClip, kSetClipBit,
etc.). GrPipelineBuilder now only defines the GrUserStencilSettings.
When the GrPipeline is finalized, the user stencil settings are then
translated into concrete GrStencilSettings.
At this point, GrClipMaskManager only needs to tell the GrAppliedClip
whether or not there is a stencil clip. It does not need to modify
stencil settings and GrPipelineBuilder does not need
AutoRestoreStencil.
This is one step of the stencil overhaul. In the future it will also
allow us to clean up the special case handling for nvpr and the
stateful fClipMode member of GrClipMaskManager.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1962243002
Review-Url: https://codereview.chromium.org/1962243002
Diffstat (limited to 'src/gpu/text/GrStencilAndCoverTextContext.cpp')
| -rw-r--r-- | src/gpu/text/GrStencilAndCoverTextContext.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp index cc018845f6..bce0716942 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp @@ -610,15 +610,17 @@ void GrStencilAndCoverTextContext::TextRun::draw(GrContext* ctx, if (fInstanceData->count()) { pipelineBuilder->setState(GrPipelineBuilder::kHWAntialias_Flag, fFont.isAntiAlias()); - static constexpr GrStencilSettings kStencilPass( - kZero_StencilOp, - kKeep_StencilOp, - kNotEqual_StencilFunc, - 0xffff, - 0x0000, - 0xffff); - - *pipelineBuilder->stencil() = kStencilPass; + static constexpr GrUserStencilSettings kCoverPass( + GrUserStencilSettings::StaticInit< + 0x0000, + GrUserStencilTest::kNotEqual, // Stencil pass accounts for clip. + 0xffff, + GrUserStencilOp::kZero, + GrUserStencilOp::kKeep, + 0xffff>() + ); + + pipelineBuilder->setUserStencil(&kCoverPass); SkAutoTUnref<GrPathRange> glyphs(this->createGlyphs(ctx)); if (fLastDrawnGlyphsID != glyphs->getUniqueID()) { |