diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-10-30 15:55:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-30 15:58:03 +0000 |
| commit | fc28138c0422637741ac2839914ef10c56438054 (patch) | |
| tree | 1a3ada623132a4fe9fcbd1853914e6aa3aef0555 /src/gpu/ops | |
| parent | dd992c4a461040e798a02cba028e55cdcd856026 (diff) | |
Revert "Fix GrDefaultPathRender inversely wound path bug"
This reverts commit 511a9d49998ec6a74c375e6cfc55f660f7987c40.
Reason for revert: vulkan
Original change's description:
> Fix GrDefaultPathRender inversely wound path bug
>
> Bug: 769898
> Change-Id: I3b1a43b1e114b35105493a0cfa01a1f01b65fa56
> Reviewed-on: https://skia-review.googlesource.com/64065
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: Ib1a987294d14f0526bf5ff5a8fd90bbd5f6f3a0d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 769898
Reviewed-on: https://skia-review.googlesource.com/65201
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrDefaultPathRenderer.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp index 4a9f0c2c04..40631a74ff 100644 --- a/src/gpu/ops/GrDefaultPathRenderer.cpp +++ b/src/gpu/ops/GrDefaultPathRenderer.cpp @@ -568,10 +568,8 @@ bool GrDefaultPathRenderer::internalDrawPath(GrRenderTargetContext* renderTarget SkScalar srcSpaceTol = GrPathUtils::scaleToleranceToSrc(tol, viewMatrix, path.getBounds()); SkRect devBounds; - GetPathDevBounds(path, - renderTargetContext->asRenderTargetProxy()->worstCaseWidth(), - renderTargetContext->asRenderTargetProxy()->worstCaseHeight(), - viewMatrix, &devBounds); + GetPathDevBounds(path, renderTargetContext->width(), renderTargetContext->height(), viewMatrix, + &devBounds); for (int p = 0; p < passCount; ++p) { if (lastPassIsBounds && (p == passCount-1)) { diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 50741bc537..27d78a782c 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -637,10 +637,8 @@ bool GrMSAAPathRenderer::internalDrawPath(GrRenderTargetContext* renderTargetCon } SkRect devBounds; - GetPathDevBounds(path, - renderTargetContext->asRenderTargetProxy()->worstCaseWidth(), - renderTargetContext->asRenderTargetProxy()->worstCaseHeight(), - viewMatrix, &devBounds); + GetPathDevBounds(path, renderTargetContext->width(), renderTargetContext->height(), viewMatrix, + &devBounds); SkASSERT(passes[0]); { // First pass |