xserver: Branch 'master'

[GitLab Mirror]

 test/damage/primitives.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit feca61cdb5351bbe178f7083938a973703aff866
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Sep 27 22:23:14 2018 +0100

    test: Initialize the pixmap in damage test

diff --git a/test/damage/primitives.c b/test/damage/primitives.c
index 5ee63b689..ac851c581 100644
--- a/test/damage/primitives.c
+++ b/test/damage/primitives.c
@@ -241,6 +241,18 @@ create_start_pixmap(struct test_setup *setup)
                       setup->start_drawable, setup->screen->root,
                       setup->width, setup->height);
 
+    /* Fill pixmap so it has defined contents */
+    xcb_gc_t fill = xcb_generate_id(setup->c);
+    uint32_t fill_values[]  = { setup->screen->white_pixel };
+    xcb_create_gc(setup->c, fill, setup->screen->root,
+                  XCB_GC_FOREGROUND, fill_values);
+
+    xcb_rectangle_t rect_all = { 0, 0, setup->width, setup->height};
+    xcb_poly_fill_rectangle(setup->c, setup->start_drawable,
+                            fill, 1, &rect_all);
+    xcb_free_gc(setup->c, fill);
+
+    /* Draw a rectangle */
     xcb_gc_t gc = xcb_generate_id(setup->c);
     uint32_t values[]  = { 0xaaaaaaaa };
     xcb_create_gc(setup->c, gc, setup->screen->root,