shape ops work in progress
major milestone: 35.8M tests pass
(all rect/triangle/quadralateral)
git-svn-id: http://skia.googlecode.com/svn/trunk@5166 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/SimplifyRect4x4_Test.cpp b/experimental/Intersection/SimplifyRect4x4_Test.cpp
index 6782d53..3768da9 100644
--- a/experimental/Intersection/SimplifyRect4x4_Test.cpp
+++ b/experimental/Intersection/SimplifyRect4x4_Test.cpp
@@ -155,8 +155,11 @@
dYAlign = 5;
}
path.close();
- outputProgress(state, pathStr);
- testSimplifyx(path, out, state, pathStr);
+ outputProgress(state, pathStr, SkPath::kWinding_FillType);
+ testSimplifyx(path, false, out, state, pathStr);
+ state.testsRun++;
+ outputProgress(state, pathStr, SkPath::kEvenOdd_FillType);
+ testSimplifyx(path, true, out, state, pathStr);
state.testsRun++;
}
}
@@ -170,7 +173,7 @@
return NULL;
}
-void Simplify4x4RectsThreaded_Test()
+void Simplify4x4RectsThreaded_Test(int& testsRun)
{
SkDebugf("%s\n", __FUNCTION__);
#ifdef SK_DEBUG
@@ -179,7 +182,7 @@
#endif
const char testLineStr[] = "testLine";
initializeTests(testLineStr, sizeof(testLineStr));
- int testsRun = 0;
+ int testsStart = testsRun;
for (int a = 0; a < 8; ++a) { // outermost
for (int b = a ; b < 8; ++b) {
for (int c = b ; c < 8; ++c) {
@@ -193,6 +196,6 @@
if (!gRunTestsInOneThread) SkDebugf("\n%d", a);
}
testsRun += waitForCompletion();
- SkDebugf("%s total tests run=%d\n", __FUNCTION__, testsRun);
+ SkDebugf("%s tests=%d total=%d\n", __FUNCTION__, testsRun - testsStart, testsRun);
}