[xserver-commit] xserver/hw/kdrive/mga Makefile.am,1.4.2.2,1.4.2.3 mga.c,1.3.2.1,1.3.2.2

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/mga
In directory pdx:/tmp/cvs-serv4383/hw/kdrive/mga

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am mga.c 
Log Message:
	* hw/kdrive/fbdev/fbdev.c: (fbdevScreenInitialize),
	(fbdevMapFramebuffer), (fbdevSetScreenSizes),
	(fbdevUnmapFramebuffer), (fbdevSetShadow), (fbdevRandRSetConfig),
	(fbdevInitScreen), (fbdevFinishInitScreen), (fbdevCreateResources):
	* hw/kdrive/fbdev/fbdev.h:
	* hw/kdrive/fbdev/fbinit.c:
	* hw/kdrive/mach64/mach64.c: (mach64CreateResources):
	* hw/kdrive/mga/Makefile.am:
	* hw/kdrive/mga/mga.c: (mgaCreateResources):
	* hw/kdrive/nvidia/Makefile.am:
	* hw/kdrive/nvidia/nvidia.c:
	* hw/kdrive/r128/Makefile.am:
	* hw/kdrive/r128/r128.c:
	* hw/kdrive/r128/r128draw.c: (r128PrepareSolid), (r128PrepareCopy):
	* hw/kdrive/smi/Makefile.am:
	* hw/kdrive/smi/smi.c:
	* hw/kdrive/smi/smi.h:
	* hw/kdrive/src/kdrive.c: (KdCreateScreenResources),
	(KdScreenInit):
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kshadow.c: (KdShadowFbAlloc), (KdShadowFbFree),
	(KdShadowSet), (KdShadowUnset):
	* hw/kdrive/vesa/vesa.c: (vesaSetScreenSizes), (vesaSetShadow),
	(vesaMapFramebuffer), (vesaUnmapFramebuffer), (vesaRandRSetConfig),
	(vesaInitScreen), (vesaFinishInitScreen), (vesaCreateResources),
	(vesaScreenFini):
	* hw/kdrive/vesa/vesa.h:
	* hw/kdrive/vesa/vesainit.c:
	Add function called at CreateScreenResources to get shadow set up
	on pixmap correctly.  Rework vesa and fbdev code to handle
	shadows right with the non-layer world.
	* mi/misprite.c:
	* mi/mispritest.h:
	Use GetScreenPixmap directly for damage detection of sprite.
	Avoids problems during server shutdown with windows disappearing
	before the sprite layer is closed.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/Makefile.am,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- Makefile.am	24 Oct 2003 06:35:24 -0000	1.4.2.2
+++ Makefile.am	24 Oct 2003 09:34:33 -0000	1.4.2.3
@@ -1,5 +1,5 @@
 INCLUDES = 					\
-	@KDRIVE_INCS@				\
+	$(KDRIVE_INCS)				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
 	$(XSERVER_CFLAGS)
 
@@ -16,6 +16,7 @@
 	mgastub.c
 
 Xmga_LDADD = \
-	libmga.a 				\
-	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	@KDRIVE_LIBS@
+	libmga.a 					\
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a 	\
+	$(KDRIVE_LIBS)					\
+	$(XSERVER_LIBS)

Index: mga.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/mga.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- mga.c	22 Oct 2003 06:00:49 -0000	1.3.2.1
+++ mga.c	24 Oct 2003 09:34:33 -0000	1.3.2.2
@@ -94,6 +94,12 @@
     return ret;
 }
 
+Bool
+mgaCreateResources (ScreenPtr pScreen)
+{
+    return vesaCreateResources (pScreen);
+}
+
 void
 mgaPreserve (KdCardInfo *card)
 {
@@ -210,6 +216,8 @@
     mgaCardInit,	/* cardinit */
     mgaScreenInit,	/* scrinit */
     mgaInitScreen,	/* initScreen */
+    mgaFinishInitScreen, /* finishInitScreen */
+    mgaCreateResources,	/* createRes */
     mgaPreserve,	/* preserve */
     mgaEnable,		/* enable */
     mgaDPMS,		/* dpms */
@@ -232,7 +240,5 @@
     
     vesaGetColors,    	 /* getColors */
     vesaPutColors,	 /* putColors */
-
-    mgaFinishInitScreen, /* finishInitScreen */
 };