diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-07-02 09:00:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-02 13:46:30 +0000 |
| commit | a219419c9d76432dca74494b611ff1f59086d139 (patch) | |
| tree | e6e5d964b27c4d4656ed1e912700796ad1fff441 /src/gpu/GrAppliedClip.h | |
| parent | 00d2e8ebcb13c388339ff1cfbd202fff9589e77a (diff) | |
Some scissor state cleanup.
Separate flushing the enablement of scissor from the rect in GrGLGpu.
Move GrPipeline::ScissorState to a global enum and use more broadly.
Rename to GrScissorTest to avoid name conflict with existing
GrScissorState.
Change-Id: Ib32160b3300bc12de2d2e1761d152fd1bba8b683
Reviewed-on: https://skia-review.googlesource.com/137395
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrAppliedClip.h')
| -rw-r--r-- | src/gpu/GrAppliedClip.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrAppliedClip.h b/src/gpu/GrAppliedClip.h index bfe3383e16..90068669db 100644 --- a/src/gpu/GrAppliedClip.h +++ b/src/gpu/GrAppliedClip.h @@ -11,10 +11,8 @@ #include "GrFragmentProcessor.h" #include "GrScissorState.h" #include "GrWindowRectsState.h" - #include "SkClipStack.h" - /** * Produced by GrHardClip. It provides a set of modifications to the hardware drawing state that * implement the clip. @@ -55,7 +53,8 @@ public: } bool doesClip() const { - return fScissorState.enabled() || this->hasStencilClip() || fWindowRectsState.enabled(); + return fScissorState.scissorTest() == GrScissorTest::kEnabled || this->hasStencilClip() || + fWindowRectsState.enabled(); } bool operator==(const GrAppliedHardClip& that) const { |