AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Update GrTriangulator to use SkPathPriv::Iterate"

Browse Source 
This reverts commit 64964bb115.

Reason for revert: Iter does not behave the same as RawIter

Original change's description:
> Update GrTriangulator to use SkPathPriv::Iterate
> 
> Change-Id: I0998f22e3ce958fd651c359c930a2e48af27ce73
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285985
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I3387f95a966d18d2262c1a6b534c61c46e4a8b4c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288662
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2020-05-07 22:06:28 +00:00 committed by Skia Commit-Bot
parent 2f2d81c434
commit 7156db2602
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gpu/GrTriangulator.cpp
View File

@ -822,8 +822,10 @@ void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clip
SkScalar toleranceSqd = tolerance * tolerance;
bool innerPolygons = (Mode::kSimpleInnerPolygons == mode);
SkPoint pts[4];
int localCurveCount = 0;
VertexList* contour = contours;
SkPath::Iter iter(path, false);
if (path.isInverseFillType()) {
SkPoint quad[4];
clipBounds.toQuad(quad);
@ -833,32 +835,34 @@ void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clip
contour++;
}
SkAutoConicToQuads converter;
for (auto [verb, pts, w] : SkPathPriv::Iterate(path)) {
SkPath::Verb verb;
while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
switch (verb) {
case SkPathVerb::kConic: {
case SkPath::kConic_Verb: {
++localCurveCount;
if (innerPolygons) {
append_point_to_contour(pts[2], contour, alloc);
break;
}
const SkPoint* quadPts = converter.computeQuads(pts, *w, toleranceSqd);
SkScalar weight = iter.conicWeight();
const SkPoint* quadPts = converter.computeQuads(pts, weight, toleranceSqd);
for (int i = 0; i < converter.countQuads(); ++i) {
append_quadratic_to_contour(quadPts, toleranceSqd, contour, alloc);
quadPts += 2;
}
break;
}
case SkPathVerb::kMove:
case SkPath::kMove_Verb:
if (contour->fHead) {
contour++;
}
append_point_to_contour(pts[0], contour, alloc);
break;
case SkPathVerb::kLine: {
case SkPath::kLine_Verb: {
append_point_to_contour(pts[1], contour, alloc);
break;
}
case SkPathVerb::kQuad: {
case SkPath::kQuad_Verb: {
++localCurveCount;
if (innerPolygons) {
append_point_to_contour(pts[2], contour, alloc);
@ -867,7 +871,7 @@ void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clip
append_quadratic_to_contour(pts, toleranceSqd, contour, alloc);
break;
}
case SkPathVerb::kCubic: {
case SkPath::kCubic_Verb: {
++localCurveCount;
if (innerPolygons) {
append_point_to_contour(pts[3], contour, alloc);
@ -878,7 +882,8 @@ void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clip
pointsLeft, alloc);
break;
}
case SkPathVerb::kClose:
case SkPath::kClose_Verb:
case SkPath::kDone_Verb:
break;
}
}
@ -2385,18 +2390,21 @@ int get_contour_count(const SkPath& path, SkScalar tolerance) {
int contourCnt = 1;
bool hasPoints = false;
SkPath::Iter iter(path, false);
SkPath::Verb verb;
SkPoint pts[4];
bool first = true;
for (auto [verb, pts, w] : SkPathPriv::Iterate(path)) {
while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
switch (verb) {
case SkPathVerb::kMove:
case SkPath::kMove_Verb:
if (!first) {
++contourCnt;
}
// fallthru.
case SkPathVerb::kLine:
case SkPathVerb::kConic:
case SkPathVerb::kQuad:
case SkPathVerb::kCubic:
case SkPath::kLine_Verb:
case SkPath::kConic_Verb:
case SkPath::kQuad_Verb:
case SkPath::kCubic_Verb:
hasPoints = true;
// fallthru to break.
default: