From efb8ff16491ecfb4d9c0c6a718684310d949d8d3 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 24 Oct 2012 22:56:20 +0100 Subject: [PATCH] sna: Add missing ValidatePicture() for flattening alphamaps Reported-by: Armands Liepins Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56367 Signed-off-by: Chris Wilson --- src/sna/sna_render.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 5bee520d..b9e47be0 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -1342,6 +1342,7 @@ sna_render_picture_flatten(struct sna *sna, assert(w <= sna->render.max_3d_size && h <= sna->render.max_3d_size); /* XXX shortcut a8? */ + DBG(("%s: %dx%d\n", __FUNCION__, w, h)); pixmap = screen->CreatePixmap(screen, w, h, 32, SNA_CREATE_SCRATCH); if (pixmap == NullPixmap) @@ -1354,6 +1355,8 @@ sna_render_picture_flatten(struct sna *sna, if (tmp == NULL) return 0; + ValidatePicture(tmp); + old_format = picture->format; picture->format = PICT_FORMAT(PICT_FORMAT_BPP(picture->format), PICT_FORMAT_TYPE(picture->format),