| commit | 916c498c04fa901dfa904cbd7ffbf69d567504c7 | [log] [tgz] |
|---|---|---|
| author | Chris Dalton <csmartdalton@google.com> | Wed Aug 15 00:53:25 2018 -0600 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Wed Aug 15 13:53:42 2018 +0000 |
| tree | d96a2597c85753801d0095e4e20a04d8f9b76444 | |
| parent | 49bb9c17d713b0b55a4beb8ca82cb9b7952acbe0 [diff] [blame] |
Consolidate the scissor enums into one "GrScissorTest" enum Bug: skia: Change-Id: If8d40b54860acb5c18d3a9a82cb2a61e3c42025f Reviewed-on: https://skia-review.googlesource.com/147172 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp index c33a6bd..f883dbd 100644 --- a/samplecode/SampleCCPRGeometry.cpp +++ b/samplecode/SampleCCPRGeometry.cpp
@@ -347,8 +347,7 @@ } } - GrPipeline pipeline(state->drawOpArgs().fProxy, GrPipeline::ScissorState::kDisabled, - SkBlendMode::kPlus); + GrPipeline pipeline(state->drawOpArgs().fProxy, GrScissorTest::kDisabled, SkBlendMode::kPlus); if (glGpu) { glGpu->handleDirtyContext();