shape ops work in progress
milestone: about 1.6M tests pass
git-svn-id: http://skia.googlecode.com/svn/trunk@5035 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp b/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
index c9d6bdd..e795cd0 100755
--- a/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
+++ b/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
@@ -1,169 +1,176 @@
#include "EdgeWalker_Test.h"
#include "Intersection_Tests.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include <assert.h>
-#include <pthread.h>
static void* testSimplify4x4QuadralateralsMain(void* data)
{
- char pathStr[1024];
- bzero(pathStr, sizeof(pathStr));
SkASSERT(data);
State4& state = *(State4*) data;
- int ax = state.a & 0x03;
- int ay = state.a >> 2;
- int bx = state.b & 0x03;
- int by = state.b >> 2;
- int cx = state.c & 0x03;
- int cy = state.c >> 2;
- int dx = state.d & 0x03;
- int dy = state.d >> 2;
- for (int e = 0 ; e < 16; ++e) {
- int ex = e & 0x03;
- int ey = e >> 2;
- for (int f = e ; f < 16; ++f) {
- int fx = f & 0x03;
- int fy = f >> 2;
- for (int g = f ; g < 16; ++g) {
- int gx = g & 0x03;
- int gy = g >> 2;
- for (int h = g ; h < 16; ++h) {
- int hx = h & 0x03;
- int hy = h >> 2;
+ char pathStr[1024];
+ bzero(pathStr, sizeof(pathStr));
+ do {
+ int ax = state.a & 0x03;
+ int ay = state.a >> 2;
+ int bx = state.b & 0x03;
+ int by = state.b >> 2;
+ int cx = state.c & 0x03;
+ int cy = state.c >> 2;
+ int dx = state.d & 0x03;
+ int dy = state.d >> 2;
+ for (int e = 0 ; e < 16; ++e) {
+ int ex = e & 0x03;
+ int ey = e >> 2;
+ for (int f = e ; f < 16; ++f) {
+ int fx = f & 0x03;
+ int fy = f >> 2;
+ for (int g = f ; g < 16; ++g) {
+ int gx = g & 0x03;
+ int gy = g >> 2;
+ for (int h = g ; h < 16; ++h) {
+ int hx = h & 0x03;
+ int hy = h >> 2;
+ SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
+ path.moveTo(ax, ay);
+ path.lineTo(bx, by);
+ path.lineTo(cx, cy);
+ path.lineTo(dx, dy);
+ path.close();
+ path.moveTo(ex, ey);
+ path.lineTo(fx, fy);
+ path.lineTo(gx, gy);
+ path.lineTo(hx, hy);
+ path.close();
+ if (1) { // gdb: set print elements 400
+ char* str = pathStr;
+ str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", dx, dy);
+ str += sprintf(str, " path.close();\n");
+ str += sprintf(str, " path.moveTo(%d, %d);\n", ex, ey);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", gx, gy);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", hx, hy);
+ str += sprintf(str, " path.close();\n");
+ }
+ outputProgress(state, pathStr);
+ testSimplifyx(path, out, state, pathStr);
+ state.testsRun++;
+ #if 0 // FIXME: enable once we have support for even/odd
+ path.setFillType(SkPath::kEvenOdd_FillType);
+ outputProgress(state, pathStr, SkPath::kEvenOdd_FillType);
+ testSimplifyx(path, true, out, state, pathStr);
+ state.testsRun++;
+ #endif
+ }
+ }
+ }
+ }
+ } while (runNextTestSet(state));
+ return NULL;
+}
+
+void Simplify4x4QuadralateralsThreaded_Test()
+{
+ SkDebugf("%s\n", __FUNCTION__);
+#ifdef SK_DEBUG
+ gDebugMaxWindSum = 4; // FIXME: 3?
+ gDebugMaxWindValue = 4;
+#endif
+ const char testStr[] = "testQuadralateral";
+ initializeTests(testStr, sizeof(testStr));
+ int testsRun = 0;
+ for (int a = 0; a < 16; ++a) {
+ for (int b = a ; b < 16; ++b) {
+ for (int c = b ; c < 16; ++c) {
+ for (int d = c; d < 16; ++d) {
+ testsRun += dispatchTest4(testSimplify4x4QuadralateralsMain,
+ a, b, c, d);
+ }
+ if (!gRunTestsInOneThread) SkDebugf(".");
+ }
+ if (!gRunTestsInOneThread) SkDebugf("%d", b);
+ }
+ if (!gRunTestsInOneThread) SkDebugf("\n%d", a);
+ }
+ testsRun += waitForCompletion();
+ SkDebugf("%s total tests run=%d\n", __FUNCTION__, testsRun);
+}
+
+
+static void* testSimplify4x4NondegeneratesMain(void* data) {
+ SkASSERT(data);
+ State4& state = *(State4*) data;
+ char pathStr[1024];
+ bzero(pathStr, sizeof(pathStr));
+ do {
+ int ax = state.a & 0x03;
+ int ay = state.a >> 2;
+ int bx = state.b & 0x03;
+ int by = state.b >> 2;
+ int cx = state.c & 0x03;
+ int cy = state.c >> 2;
+ for (int d = 0; d < 15; ++d) {
+ int dx = d & 0x03;
+ int dy = d >> 2;
+ for (int e = d + 1; e < 16; ++e) {
+ int ex = e & 0x03;
+ int ey = e >> 2;
+ for (int f = d + 1; f < 16; ++f) {
+ if (e == f) {
+ continue;
+ }
+ int fx = f & 0x03;
+ int fy = f >> 2;
+ if ((ex - dx) * (fy - dy) == (ey - dy) * (fx - dx)) {
+ continue;
+ }
SkPath path, out;
path.setFillType(SkPath::kWinding_FillType);
path.moveTo(ax, ay);
path.lineTo(bx, by);
path.lineTo(cx, cy);
- path.lineTo(dx, dy);
path.close();
- path.moveTo(ex, ey);
+ path.moveTo(dx, dy);
+ path.lineTo(ex, ey);
path.lineTo(fx, fy);
- path.lineTo(gx, gy);
- path.lineTo(hx, hy);
path.close();
- if (1) { // gdb: set print elements 400
+ if (1) {
char* str = pathStr;
str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
- str += sprintf(str, " path.lineTo(%d, %d);\n", dx, dy);
str += sprintf(str, " path.close();\n");
- str += sprintf(str, " path.moveTo(%d, %d);\n", ex, ey);
+ str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
- str += sprintf(str, " path.lineTo(%d, %d);\n", gx, gy);
- str += sprintf(str, " path.lineTo(%d, %d);\n", hx, hy);
- str += sprintf(str, " path.close();");
+ str += sprintf(str, " path.close();\n");
}
- if (!testSimplify(path, true, out, state.bitmap, state.canvas)) {
- SkDebugf("*/\n{ SkPath::kWinding_FillType, %d, %d, %d, %d,"
- " %d, %d, %d, %d },\n/*\n", state.a, state.b, state.c, state.d,
- e, f, g, h);
- }
+ outputProgress(state, pathStr);
+ testSimplifyx(path, out, state, pathStr);
+ state.testsRun++;
+ #if 0 // FIXME: enable once we have support for even/odd
path.setFillType(SkPath::kEvenOdd_FillType);
- if (!testSimplify(path, true, out, state.bitmap, state.canvas)) {
- SkDebugf("*/\n{ SkPath::kEvenOdd_FillType, %d, %d, %d, %d,"
- " %d, %d, %d, %d },\n/*\n", state.a, state.b, state.c, state.d,
- e, f, g, h);
- }
+ outputProgress(state, pathStr, SkPath::kEvenOdd_FillType);
+ testSimplifyx(path, true, out, state, pathStr);
+ state.testsRun++;
+ #endif
}
}
}
- }
- return NULL;
-}
-
-const int maxThreads = gRunTestsInOneThread ? 1 : 24;
-
-void Simplify4x4QuadralateralsThreaded_Test()
-{
- State4 threadState[maxThreads];
- int threadIndex = 0;
- for (int a = 0; a < 16; ++a) {
- for (int b = a ; b < 16; ++b) {
- for (int c = b ; c < 16; ++c) {
- for (int d = c; d < 16; ++d) {
- State4* statePtr = &threadState[threadIndex];
- statePtr->a = a;
- statePtr->b = b;
- statePtr->c = c;
- statePtr->d = d;
- if (maxThreads > 1) {
- createThread(statePtr, testSimplify4x4QuadralateralsMain);
- if (++threadIndex >= maxThreads) {
- waitForCompletion(threadState, threadIndex);
- }
- } else {
- testSimplify4x4QuadralateralsMain(statePtr);
- }
- }
- }
- }
- }
- waitForCompletion(threadState, threadIndex);
-}
-
-
-static void* testSimplify4x4NondegeneratesMain(void* data) {
- char pathStr[1024];
- bzero(pathStr, sizeof(pathStr));
- SkASSERT(data);
- State4& state = *(State4*) data;
- int ax = state.a & 0x03;
- int ay = state.a >> 2;
- int bx = state.b & 0x03;
- int by = state.b >> 2;
- int cx = state.c & 0x03;
- int cy = state.c >> 2;
- for (int d = 0; d < 15; ++d) {
- int dx = d & 0x03;
- int dy = d >> 2;
- for (int e = d + 1; e < 16; ++e) {
- int ex = e & 0x03;
- int ey = e >> 2;
- for (int f = d + 1; f < 16; ++f) {
- if (e == f) {
- continue;
- }
- int fx = f & 0x03;
- int fy = f >> 2;
- if ((ex - dx) * (fy - dy) == (ey - dy) * (fx - dx)) {
- continue;
- }
- SkPath path, out;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(ax, ay);
- path.lineTo(bx, by);
- path.lineTo(cx, cy);
- path.close();
- path.moveTo(dx, dy);
- path.lineTo(ex, ey);
- path.lineTo(fx, fy);
- path.close();
- if (1) {
- char* str = pathStr;
- str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
- str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
- str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
- str += sprintf(str, " path.close();\n");
- str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
- str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
- str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
- str += sprintf(str, " path.close();");
- }
- testSimplify(path, true, out, state.bitmap, state.canvas);
- path.setFillType(SkPath::kEvenOdd_FillType);
- testSimplify(path, true, out, state.bitmap, state.canvas);
- }
- }
- }
+ } while (runNextTestSet(state));
return NULL;
}
void SimplifyNondegenerate4x4TrianglesThreaded_Test() {
- State4 threadState[maxThreads];
- int threadIndex = 0;
+ SkDebugf("%s\n", __FUNCTION__);
+#ifdef SK_DEBUG
+ gDebugMaxWindSum = 2;
+ gDebugMaxWindValue = 2;
+#endif
+ const char testStr[] = "testNondegenerate";
+ initializeTests(testStr, sizeof(testStr));
+ int testsRun = 0;
for (int a = 0; a < 15; ++a) {
int ax = a & 0x03;
int ay = a >> 2;
@@ -179,81 +186,88 @@
if ((bx - ax) * (cy - ay) == (by - ay) * (cx - ax)) {
continue;
}
- State4* statePtr = &threadState[threadIndex];
- statePtr->a = a;
- statePtr->b = b;
- statePtr->c = c;
- if (maxThreads > 1) {
- createThread(statePtr, testSimplify4x4NondegeneratesMain);
- if (++threadIndex >= maxThreads) {
- waitForCompletion(threadState, threadIndex);
- }
- } else {
- testSimplify4x4NondegeneratesMain(statePtr);
- }
+ testsRun += dispatchTest4(testSimplify4x4NondegeneratesMain,
+ a, b, c, 0);
}
+ if (!gRunTestsInOneThread) SkDebugf(".");
}
+ if (!gRunTestsInOneThread) SkDebugf("\n%d", a);
}
- waitForCompletion(threadState, threadIndex);
+ testsRun += waitForCompletion();
+ SkDebugf("%s total tests run=%d\n", __FUNCTION__, testsRun);
}
static void* testSimplify4x4DegeneratesMain(void* data) {
- char pathStr[1024];
- bzero(pathStr, sizeof(pathStr));
SkASSERT(data);
State4& state = *(State4*) data;
- int ax = state.a & 0x03;
- int ay = state.a >> 2;
- int bx = state.b & 0x03;
- int by = state.b >> 2;
- int cx = state.c & 0x03;
- int cy = state.c >> 2;
- for (int d = 0; d < 16; ++d) {
- int dx = d & 0x03;
- int dy = d >> 2;
- for (int e = d ; e < 16; ++e) {
- int ex = e & 0x03;
- int ey = e >> 2;
- for (int f = d ; f < 16; ++f) {
- int fx = f & 0x03;
- int fy = f >> 2;
- if (state.abcIsATriangle && (ex - dx) * (fy - dy)
- != (ey - dy) * (fx - dx)) {
- continue;
+ char pathStr[1024];
+ bzero(pathStr, sizeof(pathStr));
+ do {
+ int ax = state.a & 0x03;
+ int ay = state.a >> 2;
+ int bx = state.b & 0x03;
+ int by = state.b >> 2;
+ int cx = state.c & 0x03;
+ int cy = state.c >> 2;
+ for (int d = 0; d < 16; ++d) {
+ int dx = d & 0x03;
+ int dy = d >> 2;
+ for (int e = d ; e < 16; ++e) {
+ int ex = e & 0x03;
+ int ey = e >> 2;
+ for (int f = d ; f < 16; ++f) {
+ int fx = f & 0x03;
+ int fy = f >> 2;
+ if (state.d && (ex - dx) * (fy - dy)
+ != (ey - dy) * (fx - dx)) {
+ continue;
+ }
+ SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
+ path.moveTo(ax, ay);
+ path.lineTo(bx, by);
+ path.lineTo(cx, cy);
+ path.close();
+ path.moveTo(dx, dy);
+ path.lineTo(ex, ey);
+ path.lineTo(fx, fy);
+ path.close();
+ if (1) {
+ char* str = pathStr;
+ str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
+ str += sprintf(str, " path.close();\n");
+ str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
+ str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
+ str += sprintf(str, " path.close();\n");
+ }
+ outputProgress(state, pathStr);
+ testSimplifyx(path, out, state, pathStr);
+ state.testsRun++;
+ #if 0 // FIXME: enable once we have support for even/odd
+ path.setFillType(SkPath::kEvenOdd_FillType);
+ outputProgress(state, pathStr, SkPath::kEvenOdd_FillType);
+ testSimplifyx(path, true, out, state, pathStr);
+ state.testsRun++;
+ #endif
}
- SkPath path, out;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(ax, ay);
- path.lineTo(bx, by);
- path.lineTo(cx, cy);
- path.close();
- path.moveTo(dx, dy);
- path.lineTo(ex, ey);
- path.lineTo(fx, fy);
- path.close();
- if (1) {
- char* str = pathStr;
- str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
- str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
- str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
- str += sprintf(str, " path.close();\n");
- str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
- str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
- str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
- str += sprintf(str, " path.close();");
- }
- testSimplify(path, true, out, state.bitmap, state.canvas);
- path.setFillType(SkPath::kEvenOdd_FillType);
- testSimplify(path, true, out, state.bitmap, state.canvas);
}
}
- }
+ } while (runNextTestSet(state));
return NULL;
}
void SimplifyDegenerate4x4TrianglesThreaded_Test() {
- State4 threadState[maxThreads];
- int threadIndex = 0;
+ SkDebugf("%s\n", __FUNCTION__);
+#ifdef SK_DEBUG
+ gDebugMaxWindSum = 2;
+ gDebugMaxWindValue = 2;
+#endif
+ const char testStr[] = "testDegenerate";
+ initializeTests(testStr, sizeof(testStr));
+ int testsRun = 0;
for (int a = 0; a < 16; ++a) {
int ax = a & 0x03;
int ay = a >> 2;
@@ -263,23 +277,15 @@
for (int c = a ; c < 16; ++c) {
int cx = c & 0x03;
int cy = c >> 2;
- State4* statePtr = &threadState[threadIndex];
- statePtr->abcIsATriangle = (bx - ax) * (cy - ay)
- != (by - ay) * (cx - ax);
- statePtr->a = a;
- statePtr->b = b;
- statePtr->c = c;
- if (maxThreads > 1) {
- createThread(statePtr, testSimplify4x4DegeneratesMain);
- if (++threadIndex >= maxThreads) {
- waitForCompletion(threadState, threadIndex);
- }
- } else {
- testSimplify4x4DegeneratesMain(statePtr);
- }
+ bool abcIsATriangle = (bx - ax) * (cy - ay) != (by - ay) * (cx - ax);
+ testsRun += dispatchTest4(testSimplify4x4DegeneratesMain,
+ a, b, c, abcIsATriangle);
}
+ if (!gRunTestsInOneThread) SkDebugf(".");
}
+ if (!gRunTestsInOneThread) SkDebugf("\n%d", a);
}
- waitForCompletion(threadState, threadIndex);
+ testsRun += waitForCompletion();
+ SkDebugf("%s total tests run=%d\n", __FUNCTION__, testsRun);
}