xserver/hw/xgl/glx xglx.c,1.9,1.10

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/glx
In directory gabe:/tmp/cvs-serv28594/glx

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


Index: xglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/xglx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xglx.c	22 Dec 2005 23:32:49 -0000	1.9
+++ xglx.c	23 Dec 2005 00:08:35 -0000	1.10
@@ -533,11 +533,6 @@
     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 @@
     
     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");



More information about the xserver-commit mailing list