Separate user and raw stencil settings
authorcdalton <cdalton@nvidia.com>
Wed, 11 May 2016 20:58:08 +0000 (13:58 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 11 May 2016 20:58:09 +0000 (13:58 -0700)
commit93a379bd4d6b30d86c270b879cf172d80172a72b
treeccf26fcf4d1fcba61a816f6c8fcdc8c57ddbda3b
parentf8237781d28bad38522b3b351688a2f7ee5e0caa
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
33 files changed:
gyp/gpu.gypi
src/gpu/GrClipMaskManager.cpp
src/gpu/GrClipMaskManager.h
src/gpu/GrDrawContext.cpp
src/gpu/GrDrawContextPriv.h
src/gpu/GrDrawTarget.cpp
src/gpu/GrDrawTarget.h
src/gpu/GrGpu.h
src/gpu/GrPathRenderer.h
src/gpu/GrPipeline.cpp
src/gpu/GrPipeline.h
src/gpu/GrPipelineBuilder.cpp
src/gpu/GrPipelineBuilder.h
src/gpu/GrStencil.cpp [deleted file]
src/gpu/GrStencil.h [deleted file]
src/gpu/GrStencilSettings.cpp [new file with mode: 0644]
src/gpu/GrStencilSettings.h [new file with mode: 0644]
src/gpu/GrUserStencilSettings.h [new file with mode: 0644]
src/gpu/batches/GrDefaultPathRenderer.cpp
src/gpu/batches/GrDrawPathBatch.h
src/gpu/batches/GrMSAAPathRenderer.cpp
src/gpu/batches/GrPathStencilSettings.h
src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
src/gpu/batches/GrStencilPathBatch.h
src/gpu/gl/GrGLGpu.cpp
src/gpu/gl/GrGLPathRendering.cpp
src/gpu/gl/GrGLPathRendering.h
src/gpu/gl/GrGLUtil.cpp
src/gpu/gl/GrGLUtil.h
src/gpu/text/GrStencilAndCoverTextContext.cpp
src/gpu/vk/GrVkPipeline.cpp
src/gpu/vk/GrVkPipelineState.h
tests/GLProgramsTest.cpp