Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE

1 files changed, 74 insertions, 8 deletions

diff --git a/do_tests.c b/do_tests.c
index c23f1db..378ea83 100644
--- a/do_tests.c
+++ b/do_tests.c
@@ -791,35 +791,101 @@ Test test[] = {
 		V1_4FEATURE, ROP, 0,
 		{2, 300, "escherknot", NULL, FillTiled}},
 #ifdef XRENDER
-  {"-aatrap1", "Fill 1x1 aa trapezoid", NULL,
+  {"-aatrap1", "Fill 1x1 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1 }},
+  {"-aatrap10", "Fill 10x10 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10 }},
+  {"-aatrap100", "Fill 100x100 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100 }},
+  {"-aatrap300", "Fill 300x300 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300 }},
+  {"-aa4trap1", "Fill 1x1 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "4" }},
+  {"-aa4trap10", "Fill 10x10 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "4" }},
+  {"-aa4trap100", "Fill 100x100 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "4" }},
+  {"-aa4trap300", "Fill 300x300 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "4" }},
+  {"-aa1trap1", "Fill 1x1 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "1" }},
+  {"-aa1trap10", "Fill 10x10 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "1" }},
+  {"-aa1trap100", "Fill 100x100 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "1" }},
+  {"-aa1trap300", "Fill 300x300 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "1" }},
+
+  {"-aatrap2x1", "Fill 2x1 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "8,2" }},
+  {"-aatrap2x10", "Fill 2x10 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "8,2" }},
+  {"-aatrap2x100", "Fill 2x100 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "8,2" }},
+  {"-aatrap2x300", "Fill 2x300 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "8,2" }},
+
+  {"-aatrapezoid1", "Fill 1x1 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 1 }},
-  {"-aatrap10", "Fill 10x10 aa trapezoid", NULL,
+  {"-aatrapezoid10", "Fill 10x10 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 10 }},
-  {"-aatrap100", "Fill 100x100 aa trapezoid", NULL,
+  {"-aatrapezoid100", "Fill 100x100 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 100 }},
-  {"-aatrap300", "Fill 300x300 aa trapezoid", NULL,
+  {"-aatrapezoid300", "Fill 300x300 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 300 }},
-  {"-addaatrap1", "Fill 1x1 aa pre-added trapezoid", NULL,
+  {"-addaatrapezoid1", "Fill 1x1 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 1, "add" }},
-  {"-addaatrap10", "Fill 10x10 aa pre-added trapezoid", NULL,
+  {"-addaatrapezoid10", "Fill 10x10 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 10, "add" }},
-  {"-addaatrap100", "Fill 100x100 aa pre-added trapezoid", NULL,
+  {"-addaatrapezoid100", "Fill 100x100 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 100, "add" }},
-  {"-addaatrap300", "Fill 300x300 aa pre-added trapezoid", NULL,
+  {"-addaatrapezoid300", "Fill 300x300 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
 		{POLY, 300, "add" }},