xserver/include regionstr.h,1.11,1.12 scrnintstr.h,1.16,1.17

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory gabe:/tmp/cvs-serv18301/include

Modified Files:
	regionstr.h scrnintstr.h 
Log Message:
2005-02-08  Keith Packard  <keithp at keithp.com>

	* composite/compalloc.c: (compRedirectWindow), (compNewPixmap),
	(compAllocPixmap), (compFreePixmap), (compReallocPixmap):
	* composite/compinit.c: (compCloseScreen), (compInstallColormap),
	(compAddAlternateVisuals), (compScreenInit):
	* composite/compint.h:
	* composite/compwindow.c: (compRepaintBorder),
	(compSetPixmapVisitWindow), (compCheckRedirect),
	(compPositionWindow), (compCopyWindow),
	(compSetRedirectBorderClip), (compWindowUpdateAutomatic):
	Avoid telling DDX about colormaps for synthetic visuals
	Fix border repainting on resize.
	Change pixmap allocation around

	* damageext/damageext.c: (DamageExtReport), (ProcDamageCreate),
	(ProcDamageSubtract):
	* dix/colormap.c: (CopyFree), (AllocColor), (AllocDirect):
	* fb/fbcmap.c: (fbInitVisuals):
	Change where the 'alpha bits' live in visuals.
	
	* include/regionstr.h:
	* include/scrnintstr.h:
	* mi/misprite.c:
	* miext/damage/damage.c: (getDrawableDamageRef),
	(damageDamageRegion), (damageCreateGC), (damageCopyArea),
	(damageCopyPlane), (damageRemoveDamage), (damageInsertDamage),
	(damageDestroyPixmap), (damageSetWindowPixmap), (DamageSetup),
	(DamageCreate), (DamageRegister), (DamageUnregister),
	(DamageDestroy), (DamageSubtract), (DamageEmpty):
	* miext/damage/damage.h:
	* miext/damage/damagestr.h:
	* miext/shadow/shadow.c: (shadowSetup):
	Check for NULL pCompositeClip in damage code.
	Call SourceValidate for self CopyArea/CopyPlane
	Change damageInsertDamage API so it doesn't require a pixmap


Index: regionstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/regionstr.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- regionstr.h	9 Mar 2004 12:41:18 -0000	1.11
+++ regionstr.h	8 Feb 2005 22:39:20 -0000	1.12
@@ -288,9 +288,18 @@
     (_pReg)->data = &miEmptyData; \
 }
 
+/*
+ * Note -- this macro has been changed from the original version.
+ * It used to take a valid region and reset it to the empty region.
+ * Now it takes an uninitialized region and sets it to the empty region.
+ *
+ * Code assuming the former behaviour will leak memory.
+ * Code assuming the new behaviour when run against the old version
+ * will crash
+ */
+ 
 #define REGION_NULL(_pScreen, _pReg) \
 { \
-    REGION_UNINIT(_pScreen, _pReg); \
     (_pReg)->extents = miEmptyBox; \
     (_pReg)->data = &miEmptyData; \
 }

Index: scrnintstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/scrnintstr.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- scrnintstr.h	15 Feb 2004 15:16:08 -0000	1.16
+++ scrnintstr.h	8 Feb 2005 22:39:20 -0000	1.17
@@ -79,10 +79,6 @@
 				 * it may have more or fewer */
     unsigned long	redMask, greenMask, blueMask;
     int			offsetRed, offsetGreen, offsetBlue;
-#ifdef COMPOSITE
-    unsigned long	alphaMask;
-    int			offsetAlpha;
-#endif
   } VisualRec;
 
 typedef struct _Depth {