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/PathOpsOpCircleThreadedTest.cpp | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 tests/PathOpsOpCircleThreadedTest.cpp (limited to 'tests/PathOpsOpCircleThreadedTest.cpp') diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp new file mode 100644 index 0000000000..73abdec438 --- /dev/null +++ b/tests/PathOpsOpCircleThreadedTest.cpp @@ -0,0 +1,83 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#include "PathOpsExtendedTest.h" +#include "PathOpsThreadedCommon.h" + +static void testOpCirclesMain(PathOpsThreadState* data) { + SkASSERT(data); + PathOpsThreadState& state = *data; + char pathStr[1024]; + bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter? + if (progress) { + sk_bzero(pathStr, sizeof(pathStr)); + } + + for (int a = 0 ; a < 6; ++a) { + for (int b = a + 1 ; b < 7; ++b) { + for (int c = 0 ; c < 6; ++c) { + for (int d = c + 1 ; d < 7; ++d) { + for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) { + for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) { + SkPath pathA, pathB; + if (progress) { + char* str = pathStr; + const int loopNo = 4; + str += sprintf(str, "static void circlesOp%d(skiatest::Reporter* reporter," + " const char* filename) {\n", loopNo); + str += sprintf(str, " SkPath path, pathB;\n"); + str += sprintf(str, " path.setFillType(SkPath::k%s_FillType);\n", + e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType + ? "EvenOdd" : "?UNDEFINED"); + str += sprintf(str, " path.addCircle(%d, %d, %d, %s);\n", state.fA, state.fB, + state.fC, state.fD ? "SkPath::kCW_Direction" : "SkPath::kCCW_Direction"); + str += sprintf(str, " pathB.setFillType(SkPath::k%s_FillType);\n", + f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType + ? "EvenOdd" : "?UNDEFINED"); + str += sprintf(str, " pathB.addCircle(%d, %d, %d, %s);\n", a, b, + c, d ? "SkPath::kCW_Direction" : "SkPath::kCCW_Direction"); + str += sprintf(str, " testPathOp(reporter, path, pathB, kDifference_SkPathOp," + " filename);\n"); + str += sprintf(str, "}\n"); + } + pathA.setFillType((SkPath::FillType) e); + pathA.addCircle(SkIntToScalar(state.fA), SkIntToScalar(state.fB), SkIntToScalar(state.fC), + state.fD ? SkPath::kCW_Direction : SkPath::kCCW_Direction); + pathB.setFillType((SkPath::FillType) f); + pathB.addCircle(SkIntToScalar(a), SkIntToScalar(b), SkIntToScalar(c), + d ? SkPath::kCW_Direction : SkPath::kCCW_Direction); + for (int op = 0 ; op <= kXOR_SkPathOp; ++op) { + if (progress) { + outputProgress(state.fPathStr, pathStr, (SkPathOp) op); + } + testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "circles"); + } + } + } + } + } + } + } +} + +DEF_TEST(PathOpsOpCircleThreaded, reporter) { + initializeTests(reporter, "circleOp"); + PathOpsThreadedTestRunner testRunner(reporter); + for (int a = 0; a < 6; ++a) { // outermost + for (int b = a + 1; b < 7; ++b) { + for (int c = 0 ; c < 6; ++c) { + for (int d = 0; d < 2; ++d) { + *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable, + (&testOpCirclesMain, a, b, c, d, &testRunner)); + } + } + if (!reporter->allowExtendedTest()) goto finish; + } + } +finish: + testRunner.render(); + ShowTestArray("circleOp"); +} -- cgit v1.2.3