From 1049f1246e7be4ccb68001361efceb8933e6f81c Mon Sep 17 00:00:00 2001 From: caryclark Date: Mon, 20 Apr 2015 08:31:59 -0700 Subject: Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall. Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops. TBR=reed BUG=skia:3588 Review URL: https://codereview.chromium.org/1037953004 --- tests/PathOpsSimplifyQuadThreadedTest.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/PathOpsSimplifyQuadThreadedTest.cpp') diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp index 3c92cca217..047aa6b795 100644 --- a/tests/PathOpsSimplifyQuadThreadedTest.cpp +++ b/tests/PathOpsSimplifyQuadThreadedTest.cpp @@ -49,8 +49,11 @@ static void testSimplifyQuadsMain(PathOpsThreadState* data) SkIntToScalar(hx), SkIntToScalar(hy)); path.close(); if (progress) { - // gdb: set print elements 400 + static int quadTest = 65; char* str = pathStr; + str += sprintf(str, "static void testQuads%d(skiatest::Reporter* reporter," + "const char* filename) {\n", quadTest); + str += sprintf(str, " SkPath path;\n"); str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay); str += sprintf(str, " path.quadTo(%d, %d, %d, %d);\n", bx, by, cx, cy); str += sprintf(str, " path.lineTo(%d, %d);\n", dx, dy); @@ -59,6 +62,8 @@ static void testSimplifyQuadsMain(PathOpsThreadState* data) str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy); str += sprintf(str, " path.quadTo(%d, %d, %d, %d);\n", gx, gy, hx, hy); str += sprintf(str, " path.close();\n"); + str += sprintf(str, " testSimplify(reporter, path, filename);\n"); + str += sprintf(str, "}\n"); outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType); } testSimplify(path, false, out, state, pathStr); @@ -90,5 +95,5 @@ DEF_TEST(PathOpsSimplifyQuadsThreaded, reporter) { } finish: testRunner.render(); - ShowTestArray(); + ShowTestArray("testQuads"); } -- cgit v1.2.3