[xserver-commit] xserver/fb Makefile.am,1.3,1.4 fbcmap.c,1.8,1.9 fbcopy.c,1.13,1.14 fboverlay.c,1.6,1.7

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/fb
In directory pdx:/tmp/cvs-serv23831/fb

Modified Files:
	Makefile.am fbcmap.c fbcopy.c fboverlay.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/fb/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	1 Oct 2003 06:43:50 -0000	1.3
+++ Makefile.am	2 Nov 2003 19:56:10 -0000	1.4
@@ -1,7 +1,8 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/Xext			\
 	-I$(top_srcdir)/render			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libfb.a
 

Index: fbcmap.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbcmap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fbcmap.c	11 Sep 2003 05:12:50 -0000	1.8
+++ fbcmap.c	2 Nov 2003 19:56:10 -0000	1.9
@@ -411,6 +411,7 @@
     return TRUE;
 }
 
+#ifdef NOTUSED
 Bool
 fbHasVisualTypes (int depth)
 {
@@ -421,6 +422,7 @@
 	    return TRUE;
     return FALSE;
 }
+#endif
 
 Bool
 fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)

Index: fbcopy.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbcopy.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fbcopy.c	11 Sep 2003 05:12:50 -0000	1.13
+++ fbcopy.c	2 Nov 2003 19:56:10 -0000	1.14
@@ -55,6 +55,14 @@
     int		dstBpp;
     int		dstXoff, dstYoff;
     
+#ifdef FB_24_32BIT
+    if (pSrcDrawable->bitsPerPixel != pDstDrawable->bitsPerPixel)
+    {
+	fb24_32CopyMtoN (pSrcDrawable, pDstDrawable, pGC, pbox, nbox,
+			 dx, dy, reverse, upsidedown, bitplane, closure);
+	return;
+    }
+#endif
     fbGetDrawable (pSrcDrawable, src, srcStride, srcBpp, srcXoff, srcYoff);
     fbGetDrawable (pDstDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
     
@@ -414,8 +422,7 @@
 	return NULL;
     }
 
-    if ((pSrcDrawable != pDstDrawable) &&
-	pSrcDrawable->pScreen->SourceValidate)
+    if (pSrcDrawable->pScreen->SourceValidate)
     {
 	(*pSrcDrawable->pScreen->SourceValidate) (pSrcDrawable, xIn, yIn, widthSrc, heightSrc);
     }
@@ -588,16 +595,8 @@
 	    int		xOut, 
 	    int		yOut)
 {
-    fbCopyProc	copy;
-    
-#ifdef FB_24_32BIT
-    if (pSrcDrawable->bitsPerPixel != pDstDrawable->bitsPerPixel)
-	copy = fb24_32CopyMtoN;
-    else
-#endif
-	copy = fbCopyNtoN;
     return fbDoCopy (pSrcDrawable, pDstDrawable, pGC, xIn, yIn,
-		     widthSrc, heightSrc, xOut, yOut, copy, 0, 0);
+		     widthSrc, heightSrc, xOut, yOut, fbCopyNtoN, 0, 0);
 }
 
 RegionPtr

Index: fboverlay.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fboverlay.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fboverlay.c	11 Sep 2003 05:12:50 -0000	1.6
+++ fboverlay.c	2 Nov 2003 19:56:10 -0000	1.7
@@ -28,6 +28,7 @@
 #endif
 #include "fb.h"
 #include "fboverlay.h"
+#include "shmint.h"
 
 int	fbOverlayGeneration;
 int	fbOverlayScreenPrivateIndex = -1;