xserver ChangeLog,3.314,3.315 configure.ac,3.96,3.97

[David Reveman]

Committed by: davidr

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv10696

Modified Files:
	ChangeLog configure.ac 
Log Message:
Add GLX code to Xgl

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.314
retrieving revision 3.315
diff -u -d -r3.314 -r3.315
--- ChangeLog	16 Mar 2005 21:05:51 -0000	3.314
+++ ChangeLog	13 Apr 2005 14:29:01 -0000	3.315
@@ -1,3 +1,30 @@
+2005-04-13  David Reveman  <davidr at novell.com>
+
+	* configure.ac: Require version 0.4.2 of glitz.
+
+	* hw/xgl/xglscreen.c (xglScreenInit): Initialize Composite here so
+	that we can use alternative visuals with GLX.
+	(xglScreenInit): Initialize GLX visuals.
+
+	* hw/xgl/xgl.h: Add GLX support.
+	
+	* hw/xgl/xgltrap.c (xglTrapezoidExtents): Cleanup and use
+	xglPictureClipExtents to intersect trapezoid extents with picture
+	clip bounds. 
+	(xglTrapezoids): Minor cleanup and use pixmap locking.
+	
+	* hw/xgl/xglglyph.c (xglGlyphExtents): Use xglPictureClipExtents
+	to intersect glyph extents with picture clip bounds.
+	(xglGlyphs): Minor cleanup and use pixmap locking.
+
+	* hw/xgl/xglpict.c: 
+	* hw/xgl/xgl.h: Add xglPictureClipExtents.
+
+	* hw/xgl/xglpixmap.c (xglPixmapSurfaceInit): 
+	* hw/xgl/xgloffscreen.c (xglOffscreenCompareScore): 
+	* hw/xgl/xglsync.c (xglPrepareTarget): 
+	* hw/xgl/xgl.h: Add support for pixmap locking.
+
 2005-03-16  David Reveman  <davidr at novell.com>
 
 	* configure.ac (XGLXSERVER): Xglx requires xrender >= 0.5.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.96
retrieving revision 3.97
diff -u -d -r3.96 -r3.97
--- configure.ac	16 Mar 2005 21:05:51 -0000	3.96
+++ configure.ac	13 Apr 2005 14:29:01 -0000	3.97
@@ -186,13 +186,13 @@
 AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes])
 if test "$XGLSERVER" = yes; then
 	AC_DEFINE(XGLSERVER,1,[Build GL X server])
-	XGL_REQUIRED_MODULES="glitz >= 0.4.1"
+	XGL_REQUIRED_MODULES="glitz >= 0.4.2"
 fi
 
 AM_CONDITIONAL(XGLXSERVER, [test x$XGLXSERVER = xyes])
 if test "$XGLXSERVER" = yes; then
 	AC_DEFINE(XGLXSERVER,1,[Build GLX X server])
-	XGLX_REQUIRED_MODULES="glitz-glx >= 0.4.1 xrender >= 0.5.0"
+	XGLX_REQUIRED_MODULES="glitz-glx >= 0.4.2 xrender >= 0.5.0"
 fi
 
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])