xf86-video-intel: src/sna/sna_render.c

[Chris Wilson]

 src/sna/sna_render.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit efb8ff16491ecfb4d9c0c6a718684310d949d8d3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 24 22:56:20 2012 +0100

    sna: Add missing ValidatePicture() for flattening alphamaps
    
    Reported-by: Armands Liepins <armandsl at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56367
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 5bee520..b9e47be 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),