7d34dc7747
This reverts commit 3e7af41224
.
Change-Id: Id4f66b3956f4bdbe690db20fc478b7365ee89717
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256676
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
198 lines
8.1 KiB
C++
198 lines
8.1 KiB
C++
/*
|
|
* Copyright 2012 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>
|
|
|
|
// four rects, of four sizes
|
|
// for 3 smaller sizes, tall, wide
|
|
// top upper mid lower bottom aligned (3 bits, 5 values)
|
|
// same with x (3 bits, 5 values)
|
|
// not included, square, tall, wide (2 bits)
|
|
// cw or ccw (1 bit)
|
|
|
|
static int loopNo = 6;
|
|
static std::atomic<int> gRectsTestNo{0};
|
|
|
|
static void testPathOpsRectsMain(PathOpsThreadState* data)
|
|
{
|
|
SkASSERT(data);
|
|
const SkPathFillType fts[] = { SkPathFillType::kWinding, SkPathFillType::kEvenOdd };
|
|
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 (auto e : fts) {
|
|
for (auto f : fts) {
|
|
SkPath pathA, pathB;
|
|
pathA.setFillType((SkPathFillType) e);
|
|
pathA.addRect(SkIntToScalar(state.fA), SkIntToScalar(state.fA), SkIntToScalar(state.fB),
|
|
SkIntToScalar(state.fB), SkPathDirection::kCW);
|
|
pathA.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD),
|
|
SkIntToScalar(state.fD), SkPathDirection::kCW);
|
|
pathA.close();
|
|
pathB.setFillType((SkPathFillType) f);
|
|
pathB.addRect(SkIntToScalar(a), SkIntToScalar(a), SkIntToScalar(b),
|
|
SkIntToScalar(b), SkPathDirection::kCW);
|
|
pathB.addRect(SkIntToScalar(c), SkIntToScalar(c), SkIntToScalar(d),
|
|
SkIntToScalar(d), SkPathDirection::kCW);
|
|
pathB.close();
|
|
for (int op = 0 ; op <= kXOR_SkPathOp; ++op) {
|
|
if (state.fReporter->verbose()) {
|
|
pathStr.printf(
|
|
"static void rects%d(skiatest::Reporter* reporter,"
|
|
"const char* filename) {\n", loopNo);
|
|
pathStr.appendf(" SkPath path, pathB;");
|
|
pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n",
|
|
e == SkPathFillType::kWinding ? "Winding" : e == SkPathFillType::kEvenOdd
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", state.fA, state.fA, state.fB, state.fB);
|
|
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", state.fC, state.fC, state.fD, state.fD);
|
|
pathStr.appendf(" pathB.setFillType(SkPathFillType::k%s);\n",
|
|
f == SkPathFillType::kWinding ? "Winding" : f == SkPathFillType::kEvenOdd
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
pathStr.appendf(" pathB.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", a, a, b, b);
|
|
pathStr.appendf(" pathB.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", c, c, d, d);
|
|
pathStr.appendf(" testPathOp(reporter, path, pathB, %s, filename);\n",
|
|
SkPathOpsDebug::OpStr((SkPathOp) op));
|
|
pathStr.appendf("}\n\n");
|
|
state.outputProgress(pathStr.c_str(), (SkPathOp) op);
|
|
}
|
|
SkString testName;
|
|
testName.printf("thread_rects%d", ++gRectsTestNo);
|
|
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(PathOpsRectsThreaded, reporter) {
|
|
initializeTests(reporter, "testOp");
|
|
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 = c + 1; d < 7; ++d) {
|
|
*testRunner.fRunnables.append() = new PathOpsThreadedRunnable(
|
|
&testPathOpsRectsMain, a, b, c, d, &testRunner);
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
testRunner.render();
|
|
}
|
|
|
|
static std::atomic<int> gFastTestNo{0};
|
|
|
|
static void testPathOpsFastMain(PathOpsThreadState* data)
|
|
{
|
|
SkASSERT(data);
|
|
const SkPathFillType fts[] = {
|
|
SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
|
|
SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd
|
|
};
|
|
PathOpsThreadState& state = *data;
|
|
SkString pathStr;
|
|
int step = data->fReporter->allowExtendedTest() ? 2 : 5;
|
|
for (bool a : { false, true } ) {
|
|
for (bool b : { false, true } ) {
|
|
for (int c = 0; c < 6; c += step) {
|
|
for (int d = 0; d < 6; d += step) {
|
|
for (auto e : fts) {
|
|
for (auto f : fts) {
|
|
SkPath pathA, pathB;
|
|
pathA.setFillType(e);
|
|
if (a) {
|
|
pathA.addRect(SkIntToScalar(state.fA), SkIntToScalar(state.fA), SkIntToScalar(state.fB) + c,
|
|
SkIntToScalar(state.fB), SkPathDirection::kCW);
|
|
}
|
|
pathA.close();
|
|
pathB.setFillType(f);
|
|
if (b) {
|
|
pathB.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD) + d,
|
|
SkIntToScalar(state.fD), SkPathDirection::kCW);
|
|
}
|
|
pathB.close();
|
|
const char* fillTypeStr[] = { "Winding", "EvenOdd", "InverseWinding", "InverseEvenOdd" };
|
|
for (int op = 0; op <= kXOR_SkPathOp; ++op) {
|
|
if (state.fReporter->verbose()) {
|
|
pathStr.printf(
|
|
"static void fast%d(skiatest::Reporter* reporter,"
|
|
"const char* filename) {\n", loopNo);
|
|
pathStr.appendf(" SkPath path, pathB;");
|
|
pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n", fillTypeStr[(int)e]);
|
|
if (a) {
|
|
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", state.fA, state.fA, state.fB + c, state.fB);
|
|
}
|
|
pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n", fillTypeStr[(int)f]);
|
|
if (b) {
|
|
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
|
|
" SkPathDirection::kCW);\n", state.fC, state.fC, state.fD + d, state.fD);
|
|
}
|
|
pathStr.appendf(" testPathOp(reporter, path, pathB, %s, filename);\n",
|
|
SkPathOpsDebug::OpStr((SkPathOp) op));
|
|
pathStr.appendf("}\n\n");
|
|
state.outputProgress(pathStr.c_str(), (SkPathOp) op);
|
|
}
|
|
SkString testName;
|
|
testName.printf("fast%d", ++gFastTestNo);
|
|
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(PathOpsFastThreaded, reporter) {
|
|
initializeTests(reporter, "testOp");
|
|
PathOpsThreadedTestRunner testRunner(reporter);
|
|
int step = reporter->allowExtendedTest() ? 2 : 5;
|
|
for (int a = 0; a < 6; a += step) { // outermost
|
|
for (int b = a + 1; b < 7; b += step) {
|
|
for (int c = 0 ; c < 6; c += step) {
|
|
for (int d = c + 1; d < 7; d += step) {
|
|
*testRunner.fRunnables.append() = new PathOpsThreadedRunnable(
|
|
&testPathOpsFastMain, a, b, c, d, &testRunner);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
testRunner.render();
|
|
}
|