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/GrRenderTargetContext.cpp | |
| 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/GrRenderTargetContext.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 1dbde17575..9e52558768 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -329,7 +329,7 @@ void GrRenderTargetContext::internalClear(const GrFixedClip& clip, CanClearFullscreen canClearFullscreen) { bool isFull = false; if (!clip.hasWindowRectangles()) { - isFull = !clip.scissorEnabled() || + isFull = clip.scissorTest() == GrScissorTest::kDisabled || (CanClearFullscreen::kYes == canClearFullscreen && this->caps()->preferFullscreenClears()) || clip.scissorRect().contains(SkIRect::MakeWH(this->width(), this->height())); |