aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/SkStroke.cpp8
-rw-r--r--src/core/SkStrokerPriv.h2
-rw-r--r--tests/StrokerTest.cpp44
3 files changed, 27 insertions, 27 deletions
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index ddc5a6ab3b..7e5d4e3939 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -26,7 +26,7 @@ static_assert(1 == kCubic_RecursiveLimit, "cubic_stroke_relies_on_cubic_equallin
static_assert(SK_ARRAY_COUNT(kRecursiveLimits) == kQuad_RecursiveLimit + 1,
"recursive_limits_mismatch");
-#if defined SK_DEBUG && QUAD_STROKE_APPROXIMATION
+#if defined SK_DEBUG && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int gMaxRecursion[SK_ARRAY_COUNT(kRecursiveLimits)] = { 0 };
#endif
#ifndef DEBUG_QUAD_STROKER
@@ -1141,7 +1141,7 @@ bool SkPathStroker::cubicStroke(const SkPoint cubic[4], SkQuadConstruct* quadPts
if (!SkScalarIsFinite(quadPts->fQuad[2].fX) || !SkScalarIsFinite(quadPts->fQuad[2].fY)) {
return false; // just abort if projected quad isn't representable
}
-#if QUAD_STROKE_APPROXIMATION
+#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
SkDEBUGCODE(gMaxRecursion[fFoundTangents] = SkTMax(gMaxRecursion[fFoundTangents],
fRecursionDepth + 1));
#endif
@@ -1179,7 +1179,7 @@ bool SkPathStroker::conicStroke(const SkConic& conic, SkQuadConstruct* quadPts)
addDegenerateLine(quadPts);
return true;
}
-#if QUAD_STROKE_APPROXIMATION
+#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
SkDEBUGCODE(gMaxRecursion[kConic_RecursiveLimit] = SkTMax(gMaxRecursion[kConic_RecursiveLimit],
fRecursionDepth + 1));
#endif
@@ -1211,7 +1211,7 @@ bool SkPathStroker::quadStroke(const SkPoint quad[3], SkQuadConstruct* quadPts)
addDegenerateLine(quadPts);
return true;
}
-#if QUAD_STROKE_APPROXIMATION
+#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
SkDEBUGCODE(gMaxRecursion[kQuad_RecursiveLimit] = SkTMax(gMaxRecursion[kQuad_RecursiveLimit],
fRecursionDepth + 1));
#endif
diff --git a/src/core/SkStrokerPriv.h b/src/core/SkStrokerPriv.h
index f763805381..3dd44387f2 100644
--- a/src/core/SkStrokerPriv.h
+++ b/src/core/SkStrokerPriv.h
@@ -19,7 +19,7 @@
#define CUBIC_ARC_FACTOR ((SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3)
// this enables a global which is not thread-safe; doing so triggers a TSAN error in Chrome tests.
-#define QUAD_STROKE_APPROXIMATION 0 // set to 1 to enable additional debugging in StrokerTest.cpp
+#define QUAD_STROKE_APPROX_EXTENDED_DEBUGGING 0 // set to 1 to enable debugging in StrokerTest.cpp
class SkStrokerPriv {
public:
diff --git a/tests/StrokerTest.cpp b/tests/StrokerTest.cpp
index 7b9a3400fd..aa6435f2a1 100644
--- a/tests/StrokerTest.cpp
+++ b/tests/StrokerTest.cpp
@@ -146,7 +146,7 @@ DEF_TEST(QuadStrokerUnbounded, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int best = 0;
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
@@ -157,7 +157,7 @@ DEF_TEST(QuadStrokerUnbounded, reporter) {
path.quadTo(unbounded(r), unbounded(r), unbounded(r), unbounded(r));
p.setStrokeWidth(unboundedPos(r));
p.getFillPath(path, &fill);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (best < gMaxRecursion[2]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s quad=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[2],
@@ -173,7 +173,7 @@ DEF_TEST(QuadStrokerUnbounded, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("\n%s max quad=%d\n", __FUNCTION__, best);
}
@@ -184,7 +184,7 @@ DEF_TEST(CubicStrokerUnbounded, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int bestTan = 0;
int bestCubic = 0;
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
@@ -197,7 +197,7 @@ DEF_TEST(CubicStrokerUnbounded, reporter) {
unbounded(r), unbounded(r));
p.setStrokeWidth(unboundedPos(r));
p.getFillPath(path, &fill);
- #if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+ #if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (bestTan < gMaxRecursion[0] || bestCubic < gMaxRecursion[1]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s tan=%d cubic=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[0],
@@ -214,7 +214,7 @@ DEF_TEST(CubicStrokerUnbounded, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("\n%s max tan=%d cubic=%d\n", __FUNCTION__, bestTan, bestCubic);
}
@@ -225,7 +225,7 @@ DEF_TEST(QuadStrokerConstrained, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int best = 0;
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
@@ -249,7 +249,7 @@ DEF_TEST(QuadStrokerConstrained, reporter) {
path.quadTo(quad[1].fX, quad[1].fY, quad[2].fX, quad[2].fY);
p.setStrokeWidth(r.nextRangeF(0, 500));
p.getFillPath(path, &fill);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (best < gMaxRecursion[2]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s quad=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[2],
@@ -265,7 +265,7 @@ DEF_TEST(QuadStrokerConstrained, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("\n%s max quad=%d\n", __FUNCTION__, best);
}
@@ -276,7 +276,7 @@ DEF_TEST(CubicStrokerConstrained, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int bestTan = 0;
int bestCubic = 0;
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
@@ -307,7 +307,7 @@ DEF_TEST(CubicStrokerConstrained, reporter) {
path.cubicTo(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY, cubic[3].fX, cubic[3].fY);
p.setStrokeWidth(r.nextRangeF(0, 500));
p.getFillPath(path, &fill);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (bestTan < gMaxRecursion[0] || bestCubic < gMaxRecursion[1]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s tan=%d cubic=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[0],
@@ -324,7 +324,7 @@ DEF_TEST(CubicStrokerConstrained, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("\n%s max tan=%d cubic=%d\n", __FUNCTION__, bestTan, bestCubic);
}
@@ -335,7 +335,7 @@ DEF_TEST(QuadStrokerRange, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int best = 0;
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
@@ -353,7 +353,7 @@ DEF_TEST(QuadStrokerRange, reporter) {
path.quadTo(quad[1].fX, quad[1].fY, quad[2].fX, quad[2].fY);
p.setStrokeWidth(r.nextRangeF(0, 500));
p.getFillPath(path, &fill);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (best < gMaxRecursion[2]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s quad=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[2],
@@ -369,7 +369,7 @@ DEF_TEST(QuadStrokerRange, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_verbose) {
SkDebugf("\n%s max quad=%d\n", __FUNCTION__, best);
}
@@ -380,7 +380,7 @@ DEF_TEST(CubicStrokerRange, reporter) {
SkRandom r;
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
int best[2] = { 0 };
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
@@ -392,7 +392,7 @@ DEF_TEST(CubicStrokerRange, reporter) {
r.nextRangeF(0, 500), r.nextRangeF(0, 500), r.nextRangeF(0, 500));
p.setStrokeWidth(r.nextRangeF(0, 100));
p.getFillPath(path, &fill);
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (best[0] < gMaxRecursion[0] || best[1] < gMaxRecursion[1]) {
if (FLAGS_veryVerbose) {
SkDebugf("\n%s tan=%d cubic=%d width=%1.9g\n", __FUNCTION__, gMaxRecursion[0],
@@ -409,7 +409,7 @@ DEF_TEST(CubicStrokerRange, reporter) {
return;
}
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("\n%s max tan=%d cubic=%d\n", __FUNCTION__, best[0], best[1]);
}
@@ -418,7 +418,7 @@ DEF_TEST(CubicStrokerRange, reporter) {
DEF_TEST(QuadStrokerOneOff, reporter) {
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
SkPaint p;
@@ -435,7 +435,7 @@ path.quadTo(SkBits2Float(0x4285d839), SkBits2Float(0x43ed6645), SkBits2Float(0x4
SkDebugf("fill:\n");
fill.dump();
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("max quad=%d\n", gMaxRecursion[2]);
}
@@ -443,7 +443,7 @@ path.quadTo(SkBits2Float(0x4285d839), SkBits2Float(0x43ed6645), SkBits2Float(0x4
}
DEF_TEST(CubicStrokerOneOff, reporter) {
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
sk_bzero(gMaxRecursion, sizeof(gMaxRecursion[0]) * 3);
#endif
SkPaint p;
@@ -460,7 +460,7 @@ path.cubicTo(SkBits2Float(0x4331cb76), SkBits2Float(0x43ea3340), SkBits2Float(0x
SkDebugf("fill:\n");
fill.dump();
}
-#if defined(SK_DEBUG) && QUAD_STROKE_APPROXIMATION
+#if defined(SK_DEBUG) && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING
if (FLAGS_veryVerbose) {
SkDebugf("max tan=%d cubic=%d\n", gMaxRecursion[0], gMaxRecursion[1]);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 07:08:35 +0000