xserver/hw/xgl/egl xegl.c,1.4,1.5

Dave Airlie xserver-commit at pdx.freedesktop.org
Thu Dec 22 16:08:42 PST 2005


Committed by: airlied

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

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


Index: xegl.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/egl/xegl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xegl.c	22 Dec 2005 23:32:46 -0000	1.4
+++ xegl.c	23 Dec 2005 00:08:35 -0000	1.5
@@ -542,11 +542,6 @@
     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 @@
 
     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");



More information about the xserver-commit mailing list