diff options
| author |  fmalita <fmalita@google.com> | 2016-09-20 14:06:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-20 14:06:57 -0700 |
| commit | e918417dc34c0856822e6955b788e962c289ca3d (patch) | |
| tree | 765f7adaf21ffc08275e0caac2bc44a03ccd0eb3 /src/gpu/GrShape.cpp | |
| parent | a5344ee50a643ca72742e065f5268d9cbc3e0c82 (diff) | |
Revert of Stop closing filled paths in GrShape (patchset #1 id:1 of https://codereview.chromium.org/2355833002/ )
Reason for revert:
Triggers msaa16 asserts: https://build.chromium.org/p/client.skia/builders/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/4236/steps/test_skia%20on%20Windows/logs/stdio
c:\b\work\skia\src\gpu\grmesh.h:76: fatal error: "assert(indexCount)"
Caught exception 2147483651 EXCEPTION_BREAKPOINT, was running:
msaa16 svg cartman.svg
Likely culprit:
msaa16 svg cartman.svg
Original issue's description:
> Stop closing filled paths in GrShape
>
> This can force a copy of the path data and isn't really being taken advantage of. It complicates a forthcoming change to key small paths based on their data rather than gen id.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2355833002
>
> Committed: https://skia.googlesource.com/skia/+/ad001fdc77b2dfe32c1723cb58636728dfb776d8
TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2357713002
Diffstat (limited to 'src/gpu/GrShape.cpp')
| -rw-r--r-- | src/gpu/GrShape.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp index 582858e1d9..65c982571d 100644 --- a/src/gpu/GrShape.cpp +++ b/src/gpu/GrShape.cpp @@ -361,6 +361,10 @@ void GrShape::attemptToSimplifyPath() { } else { fPathData.fGenID = this->path().getGenerationID(); } + if (this->style().isSimpleFill()) { + this->path().close(); + this->path().setIsVolatile(true); + } if (!this->style().hasNonDashPathEffect()) { if (this->style().strokeRec().getStyle() == SkStrokeRec::kStroke_Style || this->style().strokeRec().getStyle() == SkStrokeRec::kHairline_Style) { |