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/GrPipeline.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/GrPipeline.cpp')
-rw-r--r-- | src/gpu/GrPipeline.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp index 6608d7c7d2..3f68fe088c 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/GrPipeline.cpp @@ -28,7 +28,7 @@ GrPipeline::GrPipeline(const InitArgs& args, if (appliedClip.hasStencilClip()) { fFlags |= kHasStencilClip_Flag; } - if (appliedClip.scissorState().enabled()) { + if (appliedClip.scissorState().scissorTest() == GrScissorTest::kEnabled) { fFlags |= kScissorEnabled_Flag; } @@ -99,7 +99,7 @@ GrXferBarrierType GrPipeline::xferBarrierType(const GrCaps& caps) const { return this->getXferProcessor().xferBarrierType(caps); } -GrPipeline::GrPipeline(GrRenderTargetProxy* proxy, ScissorState scissorState, SkBlendMode blendmode) +GrPipeline::GrPipeline(GrRenderTargetProxy* proxy, GrScissorTest scissorTest, SkBlendMode blendmode) : fProxy(proxy) , fWindowRectsState() , fUserStencilSettings(&GrUserStencilSettings::kUnused) @@ -108,7 +108,7 @@ GrPipeline::GrPipeline(GrRenderTargetProxy* proxy, ScissorState scissorState, Sk , fFragmentProcessors() , fNumColorProcessors(0) { SkASSERT(proxy); - if (scissorState) { + if (scissorTest == GrScissorTest::kEnabled) { fFlags |= kScissorEnabled_Flag; } } |