[xserver-commit] xserver/mi Makefile.am,3.5.2.1,3.5.2.2 miinitext.c,3.71,3.71.2.1 misprite.c,3.13.2.2,3.13.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/mi
In directory pdx:/tmp/cvs-serv25100/mi

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am miinitext.c misprite.c 
Log Message:
	* Makefile.am:
	* configure.ac:
	* damageext/Makefile.am:
	* damageext/damageext.c: (DamageExtNotify), (DamageExtReport),
	(DamageExtDestroy), (ProcDamageQueryVersion), (ProcDamageCreate),
	(ProcDamageDestroy), (ProcDamageSubtract), (XDamageNumberRequests),
	(ProcDamageDispatch), (SProcDamageQueryVersion),
	(SProcDamageCreate), (SProcDamageDestroy), (SProcDamageSubtract),
	(SProcDamageDispatch), (DamageClientCallback), (DamageResetProc),
	(FreeDamageExt), (FreeDamageExtWin), (SDamageNotifyEvent),
	(DamageExtensionInit):
	* damageext/damageext.h:
	* damageext/damageextint.h:
	* hw/kdrive/fbdev/Makefile.am:
	* hw/kdrive/linux/Makefile.am:
	* hw/kdrive/mach64/Makefile.am:
	* hw/kdrive/mga/Makefile.am:
	* hw/kdrive/nvidia/Makefile.am:
	* hw/kdrive/r128/Makefile.am:
	* hw/kdrive/smi/Makefile.am:
	* hw/kdrive/src/Makefile.am:
	* hw/kdrive/vesa/Makefile.am:
	* hw/xnest/Makefile.am:
	* mi/Makefile.am:
	* mi/miinitext.c:
	* mi/misprite.c:
	* miext/damage/damage.c: (damageDamageRegion), (DamageCreate),
	(DamageDestroy):
	* miext/damage/damage.h:
	* miext/damage/damagestr.h:
	* miext/shadow/shadow.c: (shadowSetup):
	* xfixes/region.c:
	* xfixes/xfixes.h:
	* xfixes/xfixesint.h:
	Ok, so this change is way bigger than it needed to be, but I
	couldn't stand it anymore.  The "real" change here is the
	addition of the damage extension server side pieces and a
	minor change of the miext/damage interface to add a callback
	on damage destroy.  All of the configuration changes are to
	add macros for various sets of libraries so that we don't have to
	keep editing every Makefile.am whenever we add another extension
	to the library.  The xfixes changes expose VERIFY_REGION so
	that damageext can use it.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/mi/Makefile.am,v
retrieving revision 3.5.2.1
retrieving revision 3.5.2.2
diff -u -d -r3.5.2.1 -r3.5.2.2
--- Makefile.am	22 Oct 2003 06:00:50 -0000	3.5.2.1
+++ Makefile.am	24 Oct 2003 06:35:24 -0000	3.5.2.2
@@ -1,5 +1,7 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/render			\
+	-I$(top_srcdir)/xfixes			\
+	-I$(top_srcdir)/damageext		\
 	-I$(top_srcdir)/miext/damage		\
 	$(XSERVER_CFLAGS)
 

Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miinitext.c,v
retrieving revision 3.71
retrieving revision 3.71.2.1
diff -u -d -r3.71 -r3.71.2.1
--- miinitext.c	9 Oct 2003 06:36:26 -0000	3.71
+++ miinitext.c	24 Oct 2003 06:35:24 -0000	3.71.2.1
@@ -238,11 +238,14 @@
 extern void RRExtensionInit(INITARGS);
 #endif
 #ifdef XFIXES
-extern void XFixesExtensionInit(INITARGS);
+#include "xfixes.h"
 #endif
 #ifdef RES
 extern void ResExtensionInit(INITARGS);
 #endif
+#ifdef DAMAGEEXT
+#include "damageext.h"
+#endif
 
 #ifndef XFree86LOADER
 
@@ -386,6 +389,9 @@
 #ifdef RES
     ResExtensionInit();
 #endif
+#ifdef DAMAGEEXT
+    DamageExtensionInit ();
+#endif
 }
 
 void

Index: misprite.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/misprite.c,v
retrieving revision 3.13.2.2
retrieving revision 3.13.2.3
diff -u -d -r3.13.2.2 -r3.13.2.3
--- misprite.c	22 Oct 2003 21:23:44 -0000	3.13.2.2
+++ misprite.c	24 Oct 2003 06:35:24 -0000	3.13.2.3
@@ -172,6 +172,7 @@
 	return FALSE;
     
     pScreenPriv->pDamage = DamageCreate (miSpriteReportDamage,
+					 (DamageDestroyFunc) 0,
 					 DamageReportRawRegion,
 					 TRUE,
 					 (void *) pScreen);