diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-06 19:00:26 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-06 19:02:45 +0000 |
commit | c7565eeda0bde4f388745c3c235053054059c1fa (patch) | |
tree | 2792a57cfa024172e28fedbc948d15ba127059d0 /test | |
parent | 950021f8811cfc1f2394c5c5dcaf2371bb4419e7 (diff) |
test: Exercise copy/filling unsorted rectangles
Exercise the bug Keith found in the xlib backend, which claimed the
output from the rectangular tessellator would always be sorted.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.sources | 2 | ||||
-rw-r--r-- | test/copy-disjoint.c | 87 | ||||
-rw-r--r-- | test/fill-disjoint.c | 63 | ||||
-rw-r--r-- | test/reference/copy-disjoint.ref.png | bin | 0 -> 1098 bytes | |||
-rw-r--r-- | test/reference/fill-disjoint.ref.png | bin | 0 -> 1098 bytes |
5 files changed, 152 insertions, 0 deletions
diff --git a/test/Makefile.sources b/test/Makefile.sources index 2d356667..76cdb4c5 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -75,6 +75,7 @@ test_sources = \ composite-integer-translate-source.c \ composite-integer-translate-over.c \ composite-integer-translate-over-repeat.c \ + copy-disjoint.c \ copy-path.c \ coverage.c \ create-for-stream.c \ @@ -120,6 +121,7 @@ test_sources = \ fill-and-stroke-alpha.c \ fill-and-stroke-alpha-add.c \ fill-degenerate-sort-order.c \ + fill-disjoint.c \ fill-empty.c \ fill-image.c \ fill-missed-stop.c \ diff --git a/test/copy-disjoint.c b/test/copy-disjoint.c new file mode 100644 index 00000000..1ddfd5a9 --- /dev/null +++ b/test/copy-disjoint.c @@ -0,0 +1,87 @@ +/* + * Copyright © 2011 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Chris Wilson <chris@chris-wilson.co.uk> + */ + +#include "cairo-test.h" + +/* The goal is exercise a bug that existed in the xlib backend, where + * it assumed the rectangles generated by rectangular tessallator had + * any sorting guarantees. + */ + +#define WIDTH 300 +#define HEIGHT 300 + +static cairo_surface_t * +create_source (cairo_surface_t *target) +{ + cairo_surface_t *surface; + cairo_t *cr; + + surface = cairo_surface_create_similar (target, + CAIRO_CONTENT_COLOR, + WIDTH, HEIGHT); + cr = cairo_create (surface); + cairo_surface_destroy (surface); + + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); + + surface = cairo_surface_reference (cairo_get_target (cr)); + cairo_destroy (cr); + + return surface; +} + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *white; + int x; + + /* black background */ + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_paint (cr); + + /* white rectangles */ + white = create_source (cairo_get_target (cr)); + cairo_set_source_surface (cr, white, 0, 0); + cairo_surface_destroy (white); + + /* blit a set of rectangles that the rectangular tessellator + * will not emit sorted. */ + for (x = 0; x < WIDTH - 10; x += 15) + cairo_rectangle (cr, x, x, 10, HEIGHT - 2*x); + cairo_fill (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (copy_disjoint, + "Tests copying unsorted rectangles.", + "fill", /* keywords */ + NULL, /* requirements */ + WIDTH, HEIGHT, + NULL, draw) diff --git a/test/fill-disjoint.c b/test/fill-disjoint.c new file mode 100644 index 00000000..ea2c14ff --- /dev/null +++ b/test/fill-disjoint.c @@ -0,0 +1,63 @@ +/* + * Copyright © 2011 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Chris Wilson <chris@chris-wilson.co.uk> + */ + +#include "cairo-test.h" + +/* The goal is exercise a bug that existed in the xlib backend, where + * it assumed the rectangles generated by rectangular tessallator had + * any sorting guarantees. + */ + +#define WIDTH 300 +#define HEIGHT 300 + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + int x; + + /* black background */ + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_paint (cr); + + /* white rectangles */ + cairo_set_source_rgb (cr, 1, 1, 1); + + /* fill with a set of rectangles that the rectangular tessellator + * will not emit sorted. */ + for (x = 0; x < WIDTH - 10; x += 15) + cairo_rectangle (cr, x, x, 10, HEIGHT - 2*x); + cairo_fill (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (fill_disjoint, + "Tests filling unsorted rectangles.", + "fill", /* keywords */ + NULL, /* requirements */ + WIDTH, HEIGHT, + NULL, draw) diff --git a/test/reference/copy-disjoint.ref.png b/test/reference/copy-disjoint.ref.png Binary files differnew file mode 100644 index 00000000..da9a3b11 --- /dev/null +++ b/test/reference/copy-disjoint.ref.png diff --git a/test/reference/fill-disjoint.ref.png b/test/reference/fill-disjoint.ref.png Binary files differnew file mode 100644 index 00000000..da9a3b11 --- /dev/null +++ b/test/reference/fill-disjoint.ref.png |