From d822bc159672e7327054e572b659ae7dde040e83 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Fri, 23 Dec 2005 00:08:35 +0000
Subject: [PATCH] make xgl code at least build against latest glitz.

---
 hw/xgl/egl/xegl.c  | 15 ++-------------
 hw/xgl/glx/xglx.c  | 15 ++-------------
 hw/xgl/xgl.h       |  1 +
 hw/xgl/xglcmap.c   | 16 +---------------
 hw/xgl/xglscreen.c |  3 +--
 5 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/hw/xgl/egl/xegl.c b/hw/xgl/egl/xegl.c
index d250ff29f..2f4b900d6 100644
--- a/hw/xgl/egl/xegl.c
+++ b/hw/xgl/egl/xegl.c
@@ -542,11 +542,6 @@ InitOutput (ScreenInfo *pScreenInfo,
     glitz_drawable_format_t *format, templ;
     int i, maj, min, count;
     unsigned long	    mask;
-    unsigned long	    extraMask[] = {
-	GLITZ_FORMAT_PBUFFER_MASK      |
-	GLITZ_FORMAT_DOUBLEBUFFER_MASK,
-	0
-    };
 
     xglSetPixmapFormats (pScreenInfo);
 
@@ -569,14 +564,8 @@ InitOutput (ScreenInfo *pScreenInfo,
 
     mask = GLITZ_FORMAT_SAMPLES_MASK;
 
-    for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++)
-    {
-	format = glitz_egl_find_config (xdisplay, xscreen,
-						 mask | extraMask[i],
-						 &templ, 0);
-	if (format)
-	    break;
-    }
+    format = glitz_egl_find_config (xdisplay, xscreen,
+				    mask, &templ, 0);
 
     if (!format)
 	FatalError ("no visual format found");
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index b8ab38942..95df887df 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -533,11 +533,6 @@ InitOutput (ScreenInfo *pScreenInfo,
     glitz_drawable_format_t *format, templ;
     int			    i;
     unsigned long	    mask;
-    unsigned long	    extraMask[] = {
-	GLITZ_FORMAT_PBUFFER_MASK      |
-	GLITZ_FORMAT_DOUBLEBUFFER_MASK,
-	0
-    };
 
     xglSetPixmapFormats (pScreenInfo);
     
@@ -556,14 +551,8 @@ InitOutput (ScreenInfo *pScreenInfo,
     
     mask = GLITZ_FORMAT_SAMPLES_MASK;
 
-    for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++)
-    {
-	format = glitz_glx_find_drawable_format (xdisplay, xscreen,
-						 mask | extraMask[i],
-						 &templ, 0);
-	if (format)
-	    break;
-    }
+    format = glitz_glx_find_window_format (xdisplay, xscreen,
+					   mask, &templ, 0);
     
     if (!format)
 	FatalError ("no visual format found");
diff --git a/hw/xgl/xgl.h b/hw/xgl/xgl.h
index 8d0f91103..8158f5bb6 100644
--- a/hw/xgl/xgl.h
+++ b/hw/xgl/xgl.h
@@ -30,6 +30,7 @@
 #include <config.h>
 #endif
 
+#include <stdint.h>
 #include <stdio.h>
 #include <X11/X.h>
 #define NEED_EVENTS
diff --git a/hw/xgl/xglcmap.c b/hw/xgl/xglcmap.c
index d19e64b55..9e383223d 100644
--- a/hw/xgl/xglcmap.c
+++ b/hw/xgl/xglcmap.c
@@ -134,7 +134,7 @@ xglSetVisualTypesAndMasks (ScreenInfo	           *pScreenInfo,
     pPixelFormat = xglFindPixelFormat (format, visuals);
     if (pPixelFormat)
     {
-	if (visuals && format->types.window)
+	if (visuals)
 	{
 	    xglVisuals = xrealloc (xglVisuals,
 				   (nxglVisuals + 1) * sizeof (xglVisualRec));
@@ -148,20 +148,6 @@ xglSetVisualTypesAndMasks (ScreenInfo	           *pScreenInfo,
 	    }
 	}
 
-	if (format->types.pbuffer)
-	{
-	    xglPbufferVisuals =
-		xrealloc (xglPbufferVisuals,
-			  (nxglPbufferVisuals + 1) * sizeof (xglVisualRec));
-	    
-	    if (xglPbufferVisuals)
-	    {
-		xglPbufferVisuals[nxglPbufferVisuals].format  = format;
-		xglPbufferVisuals[nxglPbufferVisuals].pPixel  = NULL;
-		xglPbufferVisuals[nxglPbufferVisuals].visuals = 0;
-		nxglPbufferVisuals++;
-	    }
-	}
     }
 }
 
diff --git a/hw/xgl/xglscreen.c b/hw/xgl/xglscreen.c
index 4259e3f69..76ea92241 100644
--- a/hw/xgl/xglscreen.c
+++ b/hw/xgl/xglscreen.c
@@ -183,8 +183,7 @@ xglScreenInit (ScreenPtr        pScreen,
 
     glitz_surface_attach (pScreenPriv->surface,
 			  pScreenPriv->drawable,
-			  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR,
-			  0, 0);
+			  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
 
     pScreenPriv->backSurface = NULL;