diff options
author | Brian Salomon <bsalomon@google.com> | 2018-07-02 14:08:49 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-02 14:09:01 +0000 |
commit | d818ebf4a31724aa93fd439a2ac4195f69ae3af0 (patch) | |
tree | 28b49c892741fe114f6d99a1f2fb15fac3251133 /src/gpu/GrPipeline.h | |
parent | 068025e39ca5131b598805d5f1513cc18ae15dea (diff) |
Revert "Some scissor state cleanup."
This reverts commit a219419c9d76432dca74494b611ff1f59086d139.
Reason for revert: breaking things
Original change's description:
> 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>
TBR=bsalomon@google.com,csmartdalton@google.com
Change-Id: If71a5c5efc86d4239b40675bad2a6cb1f77460f8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/138900
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.h')
-rw-r--r-- | src/gpu/GrPipeline.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 23255287ae..f60a6d410b 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -64,6 +64,11 @@ public: return flags; } + enum ScissorState : bool { + kEnabled = true, + kDisabled = false + }; + struct InitArgs { uint32_t fFlags = 0; const GrUserStencilSettings* fUserStencil = &GrUserStencilSettings::kUnused; @@ -98,7 +103,7 @@ public: * must be "Porter Duff" (<= kLastCoeffMode). If using ScissorState::kEnabled, the caller must * specify a scissor rectangle through the DynamicState struct. **/ - GrPipeline(GrRenderTargetProxy*, GrScissorTest, SkBlendMode); + GrPipeline(GrRenderTargetProxy*, ScissorState, SkBlendMode); GrPipeline(const InitArgs&, GrProcessorSet&&, GrAppliedClip&&); @@ -174,8 +179,8 @@ public: const GrUserStencilSettings* getUserStencil() const { return fUserStencilSettings; } - GrScissorTest scissorTest() const { - return GrScissorTest(SkToBool(fFlags & kScissorEnabled_Flag)); + ScissorState isScissorEnabled() const { + return ScissorState(SkToBool(fFlags & kScissorEnabled_Flag)); } const GrWindowRectsState& getWindowRectsState() const { return fWindowRectsState; } |