xserver: Branch 'master'

[Aaron Plattner]

 composite/compinit.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 97b9374a8af5a4cc52f9074feb4ce40cf0b90796
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Sep 17 15:48:56 2008 -0700

    Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
    (cherry picked from commit 37876602957924c7cff759a800eddd574ee2385a)

diff --git a/composite/compinit.c b/composite/compinit.c
index 495188e..b2a9861 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -114,7 +114,8 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
     pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
     ret = pScreen->ChangeWindowAttributes(pWin, mask);
 
-    if (ret && (mask & CWBackingStore)) {
+    if (ret && (mask & CWBackingStore) &&
+	    pScreen->backingStoreSupport != NotUseful) {
 	if (pWin->backingStore != NotUseful) {
 	    compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
 	    pWin->backStorage = (pointer) (intptr_t) 1;