From a85c33b52c40fbae544c7dd40df8c8968e0cf7e9 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 8 Feb 2005 22:45:21 +0000
Subject: [PATCH] update Xgl to changes in damage API. Remove some flags to
 support software     mesa

---
 hw/xgl/glx/xglx.c  | 3 ---
 hw/xgl/xglpixmap.c | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index cda3e96bc..c89c496d8 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -338,9 +338,6 @@ InitOutput (ScreenInfo *pScreenInfo,
     unsigned long	    mask;
     unsigned long	    extraMask[] = {
 	GLITZ_FORMAT_PBUFFER_MASK      |
-	GLITZ_FORMAT_DOUBLEBUFFER_MASK | GLITZ_FORMAT_ALPHA_SIZE_MASK,
-	GLITZ_FORMAT_DOUBLEBUFFER_MASK | GLITZ_FORMAT_ALPHA_SIZE_MASK,
-	GLITZ_FORMAT_ALPHA_SIZE_MASK,
 	GLITZ_FORMAT_DOUBLEBUFFER_MASK,
 	0
     };
diff --git a/hw/xgl/xglpixmap.c b/hw/xgl/xglpixmap.c
index 52ae1ead1..4a49d2411 100644
--- a/hw/xgl/xglpixmap.c
+++ b/hw/xgl/xglpixmap.c
@@ -64,6 +64,7 @@ xglPixmapCreateDamage (PixmapPtr pPixmap)
     pPixmapPriv->pDamage =
 	DamageCreate (xglPixmapDamageReport, (DamageDestroyFunc) 0,
 		      DamageReportRawRegion, TRUE,
+		      pPixmap->drawable.pScreen,
 		      (void *) pPixmap);
     if (!pPixmapPriv->pDamage)
 	return FALSE;