xserver/composite compinit.c,1.15,1.16

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/composite
In directory gabe:/tmp/cvs-serv19283/composite

Modified Files:
	compinit.c 
Log Message:
2005-03-01  Keith Packard  <keithp at keithp.com>

	* composite/compinit.c: (compScreenInit):
	Disable Composite extension on servers without
	GetWindowPixmap and SetWindowPixmap (e.g. Xnest)
	
	* hw/xnest/Screen.c: (xnestOpenScreen):
	Disable shared memory pixmaps.


Index: compinit.c
===================================================================
RCS file: /cvs/xserver/xserver/composite/compinit.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- compinit.c	8 Feb 2005 22:39:20 -0000	1.15
+++ compinit.c	2 Mar 2005 05:29:56 -0000	1.16
@@ -306,6 +306,8 @@
 {
     CompScreenPtr   cs;
 
+    if (!pScreen->GetWindowPixmap || !pScreen->SetWindowPixmap)
+	return FALSE;
     if (CompGeneration != serverGeneration)
     {
 	CompScreenPrivateIndex = AllocateScreenPrivateIndex ();