Mercurial Mercurial > sustaining > oi_151a > xnv / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 876
diff changeset 
     1
 
diff -Nurp -x '*~' -x '*.orig' exa/exa_render.c exa/exa_render.c
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 876
diff changeset 
     2
 
--- exa/exa_render.c	2010-06-06 10:53:51.000000000 -0700
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 876
diff changeset 
     3
 
+++ exa/exa_render.c	2010-09-03 16:45:42.134444609 -0700
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 876
diff changeset 
     4
 
@@ -902,8 +902,9 @@ exaComposite(CARD8	op,
876
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     5
 
     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     6
 
     RegionRec region;
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     7
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     8
 
-    if (pExaScr->swappedOut)
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     9
 
-	goto fallback;
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    10
 
+    if (pExaScr->swappedOut || pSrc->pDrawable == NULL ||
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    11
 
+	(pMask != NULL && pMask->pDrawable == NULL))
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    12
 
+	    goto fallback;
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    13
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    14
 
     /* Remove repeat in source if useless */
2237d8a02546 6906694 X Server 1.7.1.902 (1.7.2 RC 2)causes server crash when enabling compiz
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    15
 
     if (pSrc->pDrawable && pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
sustaining/oi_151a/xnv