open-src/xserver/xorg/6906694.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 01 Sep 2011 19:13:57 -0700
changeset 1201 d6ebb7728565
parent 1124 7bc7e624f965
child 1276 52f85727ce94
permissions -rw-r--r--
6489124 docs needed for Xserver dtrace provider

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 6f2af8a..9a57fe6 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -902,8 +902,9 @@ exaComposite(CARD8	op,
     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
     RegionRec region;
 
-    if (pExaScr->swappedOut)
-	goto fallback;
+    if (pExaScr->swappedOut || pSrc->pDrawable == NULL || 
+	(pMask != NULL && pMask->pDrawable == NULL))
+	    goto fallback;
 
     /* Remove repeat in source if useless */
     if (pSrc->pDrawable && pSrc->repeat && !pSrc->transform && xSrc >= 0 &&