3e7af41224
This reverts commit 3a50981a83.
Reason for revert: chrome win build found compile-problem in xpsdevice
Original change's description:
> switch to new filltype for SkPath
>
> Change-Id: I7793324a9acf4afb0eb38c1e20fbb38eac25d636
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256102
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: Iacb3566da61c2512b9bd6b7e42b592febc85e031
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256530
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
90 lines
3.8 KiB
C++
90 lines
3.8 KiB
C++
/*
|
|
* 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 "include/core/SkString.h"
|
|
#include "tests/PathOpsDebug.h"
|
|
#include "tests/PathOpsExtendedTest.h"
|
|
#include "tests/PathOpsThreadedCommon.h"
|
|
|
|
#include <atomic>
|
|
|
|
static int loopNo = 4;
|
|
static std::atomic<int> gCirclesTestNo{0};
|
|
|
|
static void testOpCirclesMain(PathOpsThreadState* data) {
|
|
SkASSERT(data);
|
|
PathOpsThreadState& state = *data;
|
|
SkString 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;
|
|
pathA.setFillType((SkPath::FillType) e);
|
|
pathA.addCircle(SkIntToScalar(state.fA), SkIntToScalar(state.fB), SkIntToScalar(state.fC),
|
|
state.fD ? SkPathDirection::kCW : SkPathDirection::kCCW);
|
|
pathB.setFillType((SkPath::FillType) f);
|
|
pathB.addCircle(SkIntToScalar(a), SkIntToScalar(b), SkIntToScalar(c),
|
|
d ? SkPathDirection::kCW : SkPathDirection::kCCW);
|
|
for (int op = 0 ; op <= kXOR_SkPathOp; ++op) {
|
|
if (state.fReporter->verbose()) {
|
|
pathStr.printf("static void circlesOp%d(skiatest::Reporter* reporter,"
|
|
" const char* filename) {\n", loopNo);
|
|
pathStr.appendf(" SkPath path, pathB;\n");
|
|
pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n",
|
|
e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
pathStr.appendf(" path.addCircle(%d, %d, %d, %s);\n", state.fA, state.fB,
|
|
state.fC, state.fD ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");
|
|
pathStr.appendf(" pathB.setFillType(SkPath::k%s_FillType);\n",
|
|
f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
pathStr.appendf(" pathB.addCircle(%d, %d, %d, %s);\n", a, b,
|
|
c, d ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");
|
|
pathStr.appendf(" testPathOp(reporter, path, pathB, %s, filename);\n",
|
|
SkPathOpsDebug::OpStr((SkPathOp) op));
|
|
pathStr.appendf("}\n");
|
|
state.outputProgress(pathStr.c_str(), (SkPathOp) op);
|
|
}
|
|
SkString testName;
|
|
testName.printf("thread_circles%d", ++gCirclesTestNo);
|
|
if (!testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, testName.c_str())) {
|
|
if (state.fReporter->verbose()) {
|
|
++loopNo;
|
|
goto skipToNext;
|
|
}
|
|
}
|
|
if (PathOpsDebug::gCheckForDuplicateNames) return;
|
|
}
|
|
}
|
|
}
|
|
skipToNext: ;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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() = new PathOpsThreadedRunnable(
|
|
&testOpCirclesMain, a, b, c, d, &testRunner);
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
testRunner.render();
|
|
}
|