From da18a5675b3107c9bf99e228d85619d247fa19a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 7 Sep 2008 00:13:10 -0400 Subject: [PATCH] Extend clip-test to demonstrate a bug in source clipping --- test/clip-test.c | 64 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/test/clip-test.c b/test/clip-test.c index a52181f..457e97a 100644 --- a/test/clip-test.c +++ b/test/clip-test.c @@ -50,13 +50,13 @@ on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data) } static void -show_window (uint32_t *bits, int w, int h, int stride) +show_window (pixman_image_t *img, int w, int h, int stride) { GdkPixbuf *pixbuf; GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - pixbuf = pixbuf_from_argb32 (bits, w, h, stride); + pixbuf = pixbuf_from_argb32 (pixman_image_get_data (img), w, h, stride); g_signal_connect (window, "expose_event", G_CALLBACK (on_expose), pixbuf); g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL); @@ -66,16 +66,29 @@ show_window (uint32_t *bits, int w, int h, int stride) gtk_main (); } -int -main (int argc, char **argv) -{ #define WIDTH 200 #define HEIGHT 200 - uint32_t *src = malloc (WIDTH * HEIGHT * 4); - pixman_image_t *gradient_img; - pixman_image_t *src_img; +static pixman_image_t * +create_solid_bits (uint32_t pixel) +{ + uint32_t *pixels = malloc (WIDTH * HEIGHT * 4); int i; + + for (i = 0; i < WIDTH * HEIGHT; ++i) + pixels[i] = pixel; + + return pixman_image_create_bits (PIXMAN_a8r8g8b8, + WIDTH, HEIGHT, + pixels, + WIDTH * 4); +} + +int +main (int argc, char **argv) +{ + pixman_image_t *gradient_img; + pixman_image_t *src_img, *dst_img; pixman_gradient_stop_t stops[2] = { { pixman_int_to_fixed (0), { 0xffff, 0x0000, 0x0000, 0xffff } }, @@ -88,16 +101,17 @@ main (int argc, char **argv) pixman_point_fixed_t c_outer; pixman_fixed_t r_inner; pixman_fixed_t r_outer; + pixman_region32_t clip_region; + pixman_transform_t trans = { + { { pixman_double_to_fixed (1.3), pixman_double_to_fixed (0), pixman_double_to_fixed (-0.5), }, + { pixman_double_to_fixed (0), pixman_double_to_fixed (1), pixman_double_to_fixed (-0.5), }, + { pixman_double_to_fixed (0), pixman_double_to_fixed (0), pixman_double_to_fixed (1.0) } + } + }; gtk_init (&argc, &argv); - for (i = 0; i < WIDTH * HEIGHT; ++i) - src[i] = 0xFF0000ff; /* pale blue */ - - src_img = pixman_image_create_bits (PIXMAN_a8r8g8b8, - WIDTH, HEIGHT, - src, - WIDTH * 4); + src_img = create_solid_bits (0xff0000ff); c_inner.x = pixman_double_to_fixed (100.0); c_inner.y = pixman_double_to_fixed (100.0); @@ -109,25 +123,37 @@ main (int argc, char **argv) gradient_img = pixman_image_create_radial_gradient (&c_inner, &c_outer, r_inner, r_outer, stops, 2); - + #if 0 gradient_img = pixman_image_create_linear_gradient (&p1, &p2, stops, 2); #endif - + pixman_image_composite (PIXMAN_OP_OVER, gradient_img, NULL, src_img, 0, 0, 0, 0, 0, 0, WIDTH, HEIGHT); + pixman_region32_init_rect (&clip_region, 50, 0, 100, 200); + pixman_image_set_clip_region32 (src_img, &clip_region); + pixman_image_set_source_clipping (src_img, TRUE); + pixman_image_set_transform (src_img, &trans); + pixman_image_set_repeat (src_img, PIXMAN_REPEAT_NORMAL); + + dst_img = create_solid_bits (0xffff0000); + pixman_image_composite (PIXMAN_OP_OVER, src_img, NULL, dst_img, + 0, 0, 0, 0, 0, 0, WIDTH, HEIGHT); + + +#if 0 printf ("0, 0: %x\n", src[0]); printf ("10, 10: %x\n", src[10 * 10 + 10]); printf ("w, h: %x\n", src[(HEIGHT - 1) * 100 + (WIDTH - 1)]); +#endif - show_window (src, WIDTH, HEIGHT, WIDTH); + show_window (dst_img, WIDTH, HEIGHT, WIDTH); pixman_image_unref (gradient_img); pixman_image_unref (src_img); - free (src); return 0; } -- 2.7.4