[xserver-commit] xserver/hw/kdrive/r128 Makefile.am,1.2.2.2,1.2.2.3 r128.c,1.1,1.1.2.1 r128draw.c,1.2,1.2.2.1

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am r128.c r128draw.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/r128/Makefile.am,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- Makefile.am	24 Oct 2003 06:35:24 -0000	1.2.2.2
+++ Makefile.am	24 Oct 2003 09:34:33 -0000	1.2.2.3
@@ -1,5 +1,5 @@
 INCLUDES = 					\
-	@KDRIVE_INCS@				\
+	$(KDRIVE_INCS)				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
 	$(XSERVER_CFLAGS)
 
@@ -18,4 +18,5 @@
 Xr128_LDADD = \
 	libr128.a 				\
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	@KDRIVE_LIBS@
+	$(KDRIVE_LIBS)				\
+	$(XSERVER_LIBS)

Index: r128.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/r128/r128.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- r128.c	11 Oct 2003 19:36:13 -0000	1.1
+++ r128.c	24 Oct 2003 09:34:33 -0000	1.1.2.1
@@ -228,6 +228,8 @@
     r128CardInit,	/* cardinit */
     r128ScreenInit,	/* scrinit */
     r128InitScreen,	/* initScreen */
+    r128FinishInitScreen, /* finishInitScreen */
+    vesaCreateResources,/* createRes */
     r128Preserve,	/* preserve */
     r128Enable,		/* enable */
     r128DPMS,		/* dpms */
@@ -250,7 +252,5 @@
     
     vesaGetColors,    	 /* getColors */
     vesaPutColors,	 /* putColors */
-
-    r128FinishInitScreen, /* finishInitScreen */
 };
 

Index: r128draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/r128/r128draw.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- r128draw.c	13 Oct 2003 00:19:58 -0000	1.2
+++ r128draw.c	24 Oct 2003 09:34:33 -0000	1.2.2.1
@@ -130,12 +130,12 @@
 }
 
 Bool
-r128PrepareSolid (DrawablePtr pDrawable, int alu, Pixel pm, Pixel fg)
+r128PrepareSolid (PixmapPtr pPixmap, int alu, Pixel pm, Pixel fg)
 {
-    KdScreenPriv (pDrawable->pScreen);
+    KdScreenPriv (pPixmap->drawable.pScreen);
     r128ScreenInfo (pScreenPriv);
 
-    r128Setup (pDrawable->pScreen, 4);
+    r128Setup (pPixmap->drawable.pScreen, 4);
     R128_OUT32 (mmio, R128_REG_DP_GUI_MASTER_CNTL, r128s->dp_gui_master_cntl
 		| R128_GMC_BRUSH_SOLID_COLOR
 		| R128_GMC_SRC_DATATYPE_COLOR
@@ -163,15 +163,15 @@
 }
 
 Bool
-r128PrepareCopy (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, int dx, int dy, int alu, Pixel pm)
+r128PrepareCopy (PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, Pixel pm)
 {
-    KdScreenPriv (pSrcDrawable->pScreen);
+    KdScreenPriv (pSrc->drawable.pScreen);
     r128ScreenInfo (pScreenPriv);
     
     copydx = dx;
     copydy = dy;
 
-    r128Setup (pSrcDrawable->pScreen, 3);
+    r128Setup (pSrc->drawable.pScreen, 3);
     R128_OUT32 (mmio, R128_REG_DP_GUI_MASTER_CNTL, r128s->dp_gui_master_cntl
 		| R128_GMC_BRUSH_SOLID_COLOR
 		| R128_GMC_SRC_DATATYPE_COLOR