open-src/xserver/xorg/6906694.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 14 Mar 2011 15:37:30 -0700
changeset 1088 1c99106ccbe0
parent 876 2237d8a02546
child 1124 7bc7e624f965
permissions -rw-r--r--
6983602 Xorg 1.9 integration [PSARC/2011/008]

diff -Nurp -x '*~' -x '*.orig' exa/exa_render.c exa/exa_render.c
--- exa/exa_render.c	2010-06-06 10:53:51.000000000 -0700
+++ exa/exa_render.c	2010-09-03 16:45:42.134444609 -0700
@@ -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 &&