remove unused tests to fix new clang build
R=mtklein@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/241043002 git-svn-id: http://skia.googlecode.com/svn/trunk@14237 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
7518ff2d7e
commit
efaf53ba24
@ -15,235 +15,6 @@
|
||||
|
||||
static bool gDisableAngleTests = true;
|
||||
|
||||
static const SkPoint cubics[][4] = {
|
||||
/* 0 */ {{0, 1}, {2, 6}, {4, 2}, {5, 3}},
|
||||
/* 1 */ {{10, 234}, {10, 229.581726f}, {13.5817204f, 226}, {18, 226}},
|
||||
/* 2 */ {{132, 11419}, {130.89543151855469f, 11419}, {130, 11418.1044921875f}, {130, 11417}},
|
||||
/* 3 */ {{130.04275512695312f, 11417.4130859375f}, {130.23307800292969f, 11418.3193359375f},
|
||||
{131.03709411621094f, 11419}, {132, 11419}},
|
||||
/* 4 */ {{0,1}, {0,5}, {4,1}, {6,4}},
|
||||
/* 5 */ {{1,5}, {4,6}, {1,0}, {4,0}},
|
||||
/* 6 */ {{0,1}, {0,4}, {5,1}, {6,4}},
|
||||
/* 7 */ {{0,1}, {1,2}, {1,0}, {6,1}},
|
||||
/* 8 */ {{0,3}, {0,1}, {2,0}, {1,0}},
|
||||
/* 9 */ {{189,7}, {189,5.3431458473205566f}, {190.3431396484375f,4}, {192,4}},
|
||||
/* 10 */ {{0,1}, {1,3}, {1,0}, {6,4}},
|
||||
/* 11 */ {{0,1}, {2,3}, {2,1}, {4,3}},
|
||||
/* 12 */ {{1,2}, {3,4}, {1,0}, {3,2}},
|
||||
/* 13 */ {{0,1}, {4,6}, {4,3}, {5,4}},
|
||||
/* 14 */ {{806,11419}, {806.962890625f,11419}, {807.76690673828125f,11418.3193359375f}, {807.957275390625f,11417.4130859375f}},
|
||||
/* 15 */ {{808,11417}, {808,11418.1044921875f}, {807.10455322265625f,11419}, {806,11419}},
|
||||
/* 16 */ {{132,11419}, {130.89543151855469f,11419}, {130,11418.1044921875f}, {130,11417}},
|
||||
/* 17 */ {{130.04275512695312f,11417.4130859375f}, {130.23312377929687f,11418.3193359375f}, {131.03707885742187f,11419}, {132,11419}},
|
||||
/* 18 */ {{1006.6951293945312f,291}, {1023.263671875f,291}, {1033.8402099609375f,304.43145751953125f}, {1030.318359375f,321}},
|
||||
};
|
||||
|
||||
static const SkPoint quads[][3] = {
|
||||
/* 0 */ {{12.3423996f, 228.342407f}, {10, 230.686295f}, {10, 234}},
|
||||
/* 1 */ {{304.24319458007812f,591.75677490234375f}, {306,593.51470947265625f}, {306,596}},
|
||||
/* 2 */ {{0,0}, {3,1}, {0,3}},
|
||||
/* 3 */ {{0,1}, {3,1}, {0,2}},
|
||||
};
|
||||
|
||||
static const SkPoint lines[][2] = {
|
||||
/* 0 */ {{6, 2}, {2, 4}},
|
||||
/* 1 */ {{306,617}, {306,590}},
|
||||
/* 2 */ {{306,596}, {306,617}},
|
||||
/* 3 */ {{6,4}, {0,1}},
|
||||
/* 4 */ {{6,1}, {0,1}},
|
||||
/* 5 */ {{1,0}, {0,3}},
|
||||
/* 6 */ {{246,4}, {189,4}},
|
||||
/* 7 */ {{192,4}, {243,4}},
|
||||
/* 8 */ {{4,3}, {0,1}},
|
||||
/* 9 */ {{3,2}, {1,2}},
|
||||
/* 10 */ {{6,4}, {3,4}},
|
||||
/* 11 */ {{979.30487060546875f,561}, {1036.695068359375f,291}},
|
||||
};
|
||||
|
||||
struct SortSet {
|
||||
const SkPoint* ptData;
|
||||
int ptCount;
|
||||
double tStart;
|
||||
double tEnd;
|
||||
SkPoint endPt;
|
||||
};
|
||||
|
||||
/*static const SortSet set1[] = {
|
||||
{cubics[0], 4, 0.66666987081928919, 0.875, {0, 0}},
|
||||
{lines[0], 2, 0.574070336, 0.388888889, {0, 0}},
|
||||
{cubics[0], 4, 0.66666987081928919, 0.4050371120499307, {0, 0}},
|
||||
{lines[0], 2, 0.574070336, 0.9140625, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set1a[] = {
|
||||
{cubics[0], 4, 0.666666667, 0.405037112, {4.58007812f,2.83203125f}},
|
||||
{lines[0], 2, 0.574074074, 0.9140625, {4.44444466f,2.77777767f}},
|
||||
};*/
|
||||
|
||||
static const SortSet set2[] = {
|
||||
{cubics[0], 4, 0.666666667, 0.875, {0, 0}},
|
||||
{lines[0], 2, 0.574074074, 0.388888889, {0, 0}},
|
||||
{cubics[0], 4, 0.666666667, 0.405037112, {0, 0}},
|
||||
{lines[0], 2, 0.574074074, 0.9140625, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set3[] = {
|
||||
{cubics[1], 4, 0, 1, {0, 0}},
|
||||
{quads[0], 3, 1, 0, {0, 0}},
|
||||
};
|
||||
|
||||
/*static const SortSet set4[] = {
|
||||
{cubics[2], 4, 0.812114222, 1, {0, 0}},
|
||||
{cubics[3], 4, 0.0684734759, 0, {0, 0}},
|
||||
};*/
|
||||
|
||||
static const SortSet set5[] = {
|
||||
{lines[1], 2, 0.777777778, 1, {0, 0}},
|
||||
{quads[1], 3, 1, 4.34137342e-06, {0, 0}},
|
||||
{lines[2], 2, 0, 1, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set5a[] = {
|
||||
{lines[1], 2, 0.777777778, 1, {306,590}},
|
||||
{quads[1], 3, 1, 4.34137342e-06, {304.243195f,591.756775f}},
|
||||
{lines[2], 2, 0, 1, {306,617}},
|
||||
};
|
||||
|
||||
static const SortSet set6[] = {
|
||||
{lines[3], 2, 0.407407407, 0.554627832, {0, 0}},
|
||||
{cubics[4], 4, 0.666666667, 0.548022446, {0, 0}},
|
||||
{lines[3], 2, 0.407407407, 0, {0, 0}},
|
||||
{cubics[4], 4, 0.666666667, 1, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set6a[] = {
|
||||
{lines[3], 2, 0.407407407, 0.554627832, {2.6722331f,2.33611655f}},
|
||||
{cubics[4], 4, 0.666666667, 0.548022446, {2.61642241f,2.83718514f}},
|
||||
{lines[3], 2, 0.407407407, 0, {6,4}},
|
||||
{cubics[4], 4, 0.666666667, 1, {6,4}},
|
||||
};
|
||||
|
||||
static const SortSet set7[] = {
|
||||
{cubics[5], 4, 0.545233342, 0.545454545, {0, 0}},
|
||||
{cubics[6], 4, 0.484938134, 0.484805744, {0, 0}},
|
||||
{cubics[5], 4, 0.545233342, 0, {0, 0}},
|
||||
{cubics[6], 4, 0.484938134, 0.545454545, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set8[] = {
|
||||
{cubics[7], 4, 0.5, 0.522986744, {0, 0}},
|
||||
{lines[4], 2, 0.75, 1, {0, 0}},
|
||||
{cubics[7], 4, 0.5, 0, {0, 0}},
|
||||
{lines[4], 2, 0.75, 0.737654321, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set8a[] = {
|
||||
{cubics[7], 4, 0.5, 0.522986744, {1.60668361f,0.965592742f}},
|
||||
{lines[4], 2, 0.75, 1, {0,1}},
|
||||
{cubics[7], 4, 0.5, 0, {0,1}},
|
||||
{lines[4], 2, 0.75, 0.737654321, {1.57407403f,1}},
|
||||
};
|
||||
|
||||
static const SortSet set9[] = {
|
||||
{cubics[8], 4, 0.4, 1, {0, 0}},
|
||||
{lines[5], 2, 0.36, 0, {0, 0}},
|
||||
{cubics[8], 4, 0.4, 0.394675838, {0, 0}},
|
||||
{lines[5], 2, 0.36, 0.363999782, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set10[] = {
|
||||
{lines[6], 2, 0.947368421, 1, {0, 0}},
|
||||
{cubics[9], 4, 1, 0.500000357, {0, 0}},
|
||||
{lines[7], 2, 0, 1, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set11[] = {
|
||||
{lines[3], 2, 0.75, 1, {0, 0}},
|
||||
{cubics[10], 4, 0.5, 0.228744269, {0, 0}},
|
||||
{lines[3], 2, 0.75, 0.627112191, {0, 0}},
|
||||
{cubics[10], 4, 0.5, 0.6339746, {0, 0}},
|
||||
};
|
||||
|
||||
static const SortSet set12[] = {
|
||||
{cubics[12], 4, 0.5, 1, {0, 0}},
|
||||
{lines[8], 2, 0.5, 1, {0, 0}},
|
||||
{cubics[11], 4, 0.5, 0, {0, 0}},
|
||||
{lines[9], 2, 0.5, 1, {0, 0}},
|
||||
{cubics[12], 4, 0.5, 0, {0, 0}},
|
||||
{lines[8], 2, 0.5, 0, {0, 0}},
|
||||
{cubics[11], 4, 0.5, 1, {0, 0}},
|
||||
{lines[9], 2, 0.5, 0, {0, 0}},
|
||||
};
|
||||
|
||||
/*static const SortSet set13[] = {
|
||||
{cubics[13], 4, 0.5, 0.400631046, {0, 0}},
|
||||
{lines[10], 2, 0.791666667, 0.928, {0, 0}},
|
||||
{lines[10], 2, 0.791666667, 0.333333333, {0, 0}},
|
||||
{cubics[13], 4, 0.5, 0.866666667, {0, 0}},
|
||||
};*/
|
||||
|
||||
static const SortSet set14[] = {
|
||||
{quads[2], 3, 0.5, 0.310102051, {0, 0}},
|
||||
{quads[3], 3, 0.5, 0.2, {0, 0}},
|
||||
{quads[3], 3, 0.5, 0.770156212, {0, 0}},
|
||||
{quads[2], 3, 0.5, 0.7, {0, 0}},
|
||||
};
|
||||
|
||||
/*static const SortSet set15[] = {
|
||||
{cubics[14], 4, 0.93081374, 1, {0, 0}},
|
||||
{cubics[15], 4, 0.188518131, 0, {0, 0}},
|
||||
{cubics[14], 4, 0.93081374, 0, {0, 0}},
|
||||
};*/
|
||||
|
||||
static const SortSet set16[] = {
|
||||
{cubics[17], 4, 0.0682619216, 0, {130.042755f,11417.4131f}},
|
||||
{cubics[16], 4, 0.812302088, 1, {130,11417}},
|
||||
{cubics[17], 4, 0.0682619216, 1, {132,11419}},
|
||||
};
|
||||
|
||||
static const SortSet set17[] = {
|
||||
{lines[11], 2, 0.888889581, 1, {0, 0}},
|
||||
{cubics[18], 4, 0.999996241, 0, {0, 0}},
|
||||
{lines[11], 2, 0.888889581, 0, {0, 0}},
|
||||
{cubics[18], 4, 0.999996241, 1, {0, 0}},
|
||||
};
|
||||
|
||||
struct SortSetTests {
|
||||
const char* name;
|
||||
const SortSet* set;
|
||||
size_t count;
|
||||
SkPoint startPt;
|
||||
};
|
||||
|
||||
#define TEST_ENTRY(name) #name, name, SK_ARRAY_COUNT(name)
|
||||
|
||||
static const SortSetTests tests[] = {
|
||||
{ TEST_ENTRY(set17), {0, 0}},
|
||||
{ TEST_ENTRY(set16), {130.090179f,11417.5957f} },
|
||||
// { TEST_ENTRY(set15), {0, 0}},
|
||||
{ TEST_ENTRY(set14), {0, 0}},
|
||||
// { TEST_ENTRY(set13), {0, 0}},
|
||||
{ TEST_ENTRY(set12), {0, 0}},
|
||||
{ TEST_ENTRY(set11), {0, 0}},
|
||||
{ TEST_ENTRY(set10), {0, 0}},
|
||||
{ TEST_ENTRY(set9), {0, 0}},
|
||||
{ TEST_ENTRY(set6a), {3.55555558f,2.77777767f} },
|
||||
{ TEST_ENTRY(set8a), {1.5f,1} },
|
||||
{ TEST_ENTRY(set8), {0, 0}},
|
||||
{ TEST_ENTRY(set7), {0, 0}},
|
||||
{ TEST_ENTRY(set6a), {3.55555558f,2.77777767f} },
|
||||
{ TEST_ENTRY(set6), {0, 0}},
|
||||
{ TEST_ENTRY(set5a), {306,596} },
|
||||
{ TEST_ENTRY(set5), {0, 0}},
|
||||
// { TEST_ENTRY(set4), {0, 0}},
|
||||
{ TEST_ENTRY(set3), {0, 0}},
|
||||
{ TEST_ENTRY(set2), {0, 0}},
|
||||
// { TEST_ENTRY(set1a), {3.70370364f,3.14814806f} },
|
||||
// { TEST_ENTRY(set1), {0, 0}},
|
||||
};
|
||||
|
||||
#undef TEST_ENTRY
|
||||
|
||||
static float next(float f)
|
||||
{
|
||||
int fBits = SkFloatAs2sCompliment(f);
|
||||
|
Loading…
Reference in New Issue
Block a user