diff options
| author |  cdalton <cdalton@nvidia.com> | 2016-05-11 13:58:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 13:58:09 -0700 |
| commit | 93a379bd4d6b30d86c270b879cf172d80172a72b (patch) | |
| tree | ccf26fcf4d1fcba61a816f6c8fcdc8c57ddbda3b /src/gpu/batches/GrMSAAPathRenderer.cpp | |
| parent | f8237781d28bad38522b3b351688a2f7ee5e0caa (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
Committed: https://skia.googlesource.com/skia/+/12dbb3947e1aaf205b4fcf13b40e54e50650eb37
Review-Url: https://codereview.chromium.org/1962243002
Diffstat (limited to 'src/gpu/batches/GrMSAAPathRenderer.cpp')
| -rw-r--r-- | src/gpu/batches/GrMSAAPathRenderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp index 6e0076c11f..8b1319b682 100644 --- a/src/gpu/batches/GrMSAAPathRenderer.cpp +++ b/src/gpu/batches/GrMSAAPathRenderer.cpp @@ -578,11 +578,11 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target, // face culling doesn't make sense here SkASSERT(GrPipelineBuilder::kBoth_DrawFace == pipelineBuilder->getDrawFace()); - int passCount = 0; - const GrStencilSettings* passes[3]; - GrPipelineBuilder::DrawFace drawFace[3]; - bool reverse = false; - bool lastPassIsBounds; + int passCount = 0; + const GrUserStencilSettings* passes[3]; + GrPipelineBuilder::DrawFace drawFace[3]; + bool reverse = false; + bool lastPassIsBounds; if (single_pass_path(path)) { passCount = 1; @@ -647,7 +647,7 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target, for (int p = 0; p < passCount; ++p) { pipelineBuilder->setDrawFace(drawFace[p]); if (passes[p]) { - *pipelineBuilder->stencil() = *passes[p]; + pipelineBuilder->setUserStencil(passes[p]); } if (lastPassIsBounds && (p == passCount-1)) { |