[PATCH 1/2] composite: Don't backfill non-bg-None windows

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 composite/compalloc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 73adc72..d21b41d 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -486,7 +486,13 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
     
     pPixmap->screen_x = x;
     pPixmap->screen_y = y;
-    
+
+    /* if we don't need to backfill, we're done */
+    if (pWin->backgroundState != BackgroundPixmap)
+        return pPixmap;
+    if (pWin->background.pixmap != None)
+        return pPixmap;
+
     if (pParent->drawable.depth == pWin->drawable.depth)
     {
 	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);
-- 
1.6.5.2