diff options
| author |  robertphillips <robertphillips@google.com> | 2015-10-26 14:12:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-26 14:12:25 -0700 |
| commit | 24cdec1744892d499ce7ef59b81ea63b47193e24 (patch) | |
| tree | 5437dd3e5157e6d72b06754d5b94e579a4bd64bb /src/gpu/GrDrawContext.cpp | |
| parent | ee7d516d4bc13a0e449ccdc55a3858845516b864 (diff) | |
Revert of Fix ClipMaskManager's SW-fallback logic (patchset #4 id:60001 of https://codereview.chromium.org/1421533007/ )
Reason for revert:
Logic may be incorrect
Original issue's description:
> Fix ClipMaskManager's SW-fallback logic
>
>
> 'useSWOnlyPath' was not correctly toggling between stencil and color draws so there was a mismatch with the behavior in createAlphaClipMask (i.e., we were inadvertently rendering some of the elements in a clip using SW but using stenciling for others - precisely what 'useSWOnlyPath' was intended to prevent).
>
> Committed: https://skia.googlesource.com/skia/+/5c3ea4cd3921e8904d4f201bcdedfd5b8a726542
TBR=bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1426443008
Diffstat (limited to 'src/gpu/GrDrawContext.cpp')
| -rw-r--r-- | src/gpu/GrDrawContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp index d64273a828..f52d7dcd15 100644 --- a/src/gpu/GrDrawContext.cpp +++ b/src/gpu/GrDrawContext.cpp @@ -691,7 +691,7 @@ void GrDrawContext::internalDrawPath(GrPipelineBuilder* pipelineBuilder, const GrStrokeInfo* strokeInfoPtr = &strokeInfo; // Try a 1st time without stroking the path and without allowing the SW renderer - GrPathRenderer* pr = fDrawingManager->getContext()->getPathRenderer(*pipelineBuilder, + GrPathRenderer* pr = fDrawingManager->getContext()->getPathRenderer(pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr, false, type); @@ -707,7 +707,7 @@ void GrDrawContext::internalDrawPath(GrPipelineBuilder* pipelineBuilder, return; } strokeInfoPtr = &dashlessStrokeInfo; - pr = fDrawingManager->getContext()->getPathRenderer(*pipelineBuilder, viewMatrix, + pr = fDrawingManager->getContext()->getPathRenderer(pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr, false, type); } @@ -732,7 +732,7 @@ void GrDrawContext::internalDrawPath(GrPipelineBuilder* pipelineBuilder, } // This time, allow SW renderer - pr = fDrawingManager->getContext()->getPathRenderer(*pipelineBuilder, viewMatrix, + pr = fDrawingManager->getContext()->getPathRenderer(pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr, true, type); } |