xserver/hw/xgl xgl.h, 1.14, 1.15 xglcmap.c, 1.6, 1.7 xglscreen.c, 1.9, 1.10

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv28594

Modified Files:
	xgl.h xglcmap.c xglscreen.c 
Log Message:
make xgl code at least build against latest glitz.


Index: xgl.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xgl.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xgl.h	7 Jun 2005 08:53:40 -0000	1.14
+++ xgl.h	23 Dec 2005 00:08:35 -0000	1.15
@@ -30,6 +30,7 @@
 #include <config.h>
 #endif
 
+#include <stdint.h>
 #include <stdio.h>
 #include <X11/X.h>
 #define NEED_EVENTS

Index: xglcmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcmap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xglcmap.c	22 Dec 2005 23:31:15 -0000	1.6
+++ xglcmap.c	23 Dec 2005 00:08:35 -0000	1.7
@@ -134,7 +134,7 @@
     pPixelFormat = xglFindPixelFormat (format, visuals);
     if (pPixelFormat)
     {
-	if (visuals && format->types.window)
+	if (visuals)
 	{
 	    xglVisuals = xrealloc (xglVisuals,
 				   (nxglVisuals + 1) * sizeof (xglVisualRec));
@@ -148,20 +148,6 @@
 	    }
 	}
 
-	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++;
-	    }
-	}
     }
 }
 

Index: xglscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglscreen.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xglscreen.c	7 Jun 2005 08:53:40 -0000	1.9
+++ xglscreen.c	23 Dec 2005 00:08:35 -0000	1.10
@@ -183,8 +183,7 @@
 
     glitz_surface_attach (pScreenPriv->surface,
 			  pScreenPriv->drawable,
-			  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR,
-			  0, 0);
+			  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
 
     pScreenPriv->backSurface = NULL;