[xserver-commit] xserver/os io.c,3.39,3.40

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/os
In directory pdx:/tmp/cvs-serv16409/os

Modified Files:
	io.c 
Log Message:
	* miext/damage/damage.c: (damageComposite), (damageGlyphs),
	(damageFillSpans), (damageSetSpans), (damagePutImage),
	(damageCopyArea), (damageCopyPlane), (damagePolyPoint),
	(damagePolylines), (damagePolySegment), (damagePolyRectangle),
	(damagePolyArc), (damageFillPolygon), (damagePolyFillRect),
	(damagePolyFillArc), (damagePolyText8), (damagePolyText16),
	(damageImageText8), (damageImageText16), (damagePushPixels):
	Trim damage to CompositeClips for GC and Picture ops.
	
	* os/io.c: (FlushAllOutput):
	Trust SmartSchedule to run each slice long enough and make
	FlushAllOutput actually flush, even with pending requests.


Index: io.c
===================================================================
RCS file: /cvs/xserver/xserver/os/io.c,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -d -r3.39 -r3.40
--- io.c	29 Sep 2003 01:42:40 -0000	3.39
+++ io.c	2 Dec 2003 07:11:47 -0000	3.40
@@ -846,6 +846,9 @@
 		continue;
 	    oc = (OsCommPtr)client->osPrivate;
 	    if (
+#ifdef SMART_SCHEDULE
+		SmartScheduleDisable &&
+#endif
 #ifdef LBX
 		!oc->proxy &&
 #endif
@@ -870,6 +873,9 @@
 		continue;
 	    oc = (OsCommPtr)client->osPrivate;
 	    if (
+#ifdef SMART_SCHEDULE
+		SmartScheduleDisable &&
+#endif
 #ifdef LBX
 		!oc->proxy &&
 #endif