From ad6355311b8b80777bc0fec95f6bf6cd1b4969d9 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 26 Jul 2012 01:02:53 +0100
Subject: [PATCH] sna: Compile against xorg-1.10

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/fb/fbpict.c |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/sna/fb/fbpict.c b/src/sna/fb/fbpict.c
index f6bcb64..a203851 100644
--- a/src/sna/fb/fbpict.c
+++ b/src/sna/fb/fbpict.c
@@ -31,6 +31,30 @@
 #include <mipict.h>
 #include "fbpict.h"
 
+static void
+SourceValidateOnePicture(PicturePtr picture)
+{
+	DrawablePtr drawable = picture->pDrawable;
+	ScreenPtr screen;
+
+	if (!drawable)
+		return;
+
+	screen = drawable->pScreen;
+	if (screen->SourceValidate)
+		screen->SourceValidate(drawable,
+				       0, 0, drawable->width, drawable->height,
+				       picture->subWindowMode);
+}
+
+static void
+fbCompositeSourceValidate(PicturePtr picture)
+{
+	SourceValidateOnePicture(picture);
+	if (picture->alphaMap)
+		SourceValidateOnePicture(picture->alphaMap);
+}
+
 void
 fbComposite(CARD8 op,
             PicturePtr pSrc,
@@ -46,9 +70,9 @@ fbComposite(CARD8 op,
 	int msk_xoff, msk_yoff;
 	int dst_xoff, dst_yoff;
 
-	miCompositeSourceValidate(pSrc);
+	fbCompositeSourceValidate(pSrc);
 	if (pMask)
-		miCompositeSourceValidate(pMask);
+		fbCompositeSourceValidate(pMask);
 
 	src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
 	mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);
-- 
1.7.10.4