Attachment 454 Details for Bug 839 – The patch

[patch] The patch

mmx.patch (text/plain), 15.21 KB, created by Søren Sandmann Pedersen on 2004-07-08 09:49:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Søren Sandmann Pedersen

Created: 2004-07-08 09:49:42 UTC

Size: 15.21 KB

patch

obsolete

>Index: config/cf/xorg.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
>retrieving revision 1.9
>diff -u -r1.9 xorg.cf
>--- config/cf/xorg.cf	30 Jun 2004 20:06:51 -0000	1.9
>+++ config/cf/xorg.cf	2 Jul 2004 20:12:59 -0000
>@@ -1416,6 +1416,14 @@
> #  else
> #   define Gcc28Warnings /* */
> #  endif
>+# ifndef HasGcc34
>+#  if (((GccMajorVersion == 3) && (GccMinorVersion >= 4)) ||	\
>+ 	(GccMajorVersion > 3))
>+#   define HasGcc34 YES
>+#  else
>+#   define HasGcc34 NO
>+#  endif
>+# endif
> # endif
> # ifndef GccWarningOptions
> #  if XFree86Devel
>Index: programs/Xserver/fb/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/Imakefile,v
>retrieving revision 1.3
>diff -u -r1.3 Imakefile
>--- programs/Xserver/fb/Imakefile	30 Jun 2004 20:06:53 -0000	1.3
>+++ programs/Xserver/fb/Imakefile	2 Jul 2004 20:13:23 -0000
>@@ -3,6 +3,11 @@
> XCOMM 
> XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $
> 
>+#if defined(i386Architecture) && defined(HasGcc34) && HasGcc34
>+#undef DefaultCCOptions
>+#define DefaultCCOptions -mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000 -DUSE_GCC34_MMX
>+#endif
>+
> #if DoLoadableServer
> #if !BuildModuleInSubdir
> #define IHaveModules
>@@ -59,7 +64,8 @@
> 	fbutil.c \
> 	fbwindow.c \
> 	fb24_32.c \
>-	fbpict.c
>+	fbpict.c \
>+	fbmmx.c 
> 
> OBJS =	$(XFMODOBJ) \
> 	fbarc.o \
>@@ -93,7 +99,8 @@
> 	fbutil.o \
> 	fbwindow.o \
> 	fb24_32.o \
>-	fbpict.o
>+	fbpict.o \
>+	fbmmx.o
> 
>    INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
> 	      -I$(XINCLUDESRC) \
>@@ -161,6 +168,7 @@
> LinkSourceFile(fbtrap.c,LinkDirectory)
> LinkSourceFile(fbutil.c,LinkDirectory)
> LinkSourceFile(fbwindow.c,LinkDirectory)
>+LinkSourceFile(fbmmx.c,LinkDirectory)
> #endif
> 
> InstallDriverSDKLibraryModule(fb,$(DRIVERSDKMODULEDIR),.)
>Index: programs/Xserver/fb/fbfill.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbfill.c,v
>retrieving revision 1.2
>diff -u -r1.2 fbfill.c
>--- programs/Xserver/fb/fbfill.c	23 Apr 2004 19:05:14 -0000	1.2
>+++ programs/Xserver/fb/fbfill.c	2 Jul 2004 20:13:23 -0000
>@@ -24,6 +24,7 @@
> /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */
> 
> #include "fb.h"
>+#include "fbmmx.h"
> 
> void
> fbFill (DrawablePtr pDrawable,
>@@ -43,6 +44,11 @@
> 
>     switch (pGC->fillStyle) {
>     case FillSolid:
>+#ifdef USE_GCC34_MMX
>+	if (!pPriv->and && fbHaveMMX())
>+	    if (fbSolidFillmmx (pDrawable, x, y, width, height, pPriv->xor))
>+		return;
>+#endif	    
> 	fbSolid (dst + (y + dstYoff) * dstStride, 
> 		 dstStride, 
> 		 (x + dstXoff) * dstBpp,
>Index: programs/Xserver/fb/fbpict.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v
>retrieving revision 1.3
>diff -u -r1.3 fbpict.c
>--- programs/Xserver/fb/fbpict.c	12 May 2004 01:49:46 -0000	1.3
>+++ programs/Xserver/fb/fbpict.c	2 Jul 2004 20:13:23 -0000
>@@ -30,34 +30,8 @@
> #include "picturestr.h"
> #include "mipict.h"
> #include "fbpict.h"
>+#include "fbmmx.h"
> 
>-#define cvt8888to0565(s)    ((((s) >> 3) & 0x001f) | \
>-			     (((s) >> 5) & 0x07e0) | \
>-			     (((s) >> 8) & 0xf800))
>-#define cvt0565to8888(s)    (((((s) << 3) & 0xf8) | (((s) >> 2) & 0x7)) | \
>-			     ((((s) << 5) & 0xfc00) | (((s) >> 1) & 0x300)) | \
>-			     ((((s) << 8) & 0xf80000) | (((s) << 3) & 0x70000)))
>-
>-#if IMAGE_BYTE_ORDER == MSBFirst
>-#define Fetch24(a)  ((unsigned long) (a) & 1 ? \
>-		     ((*(a) << 16) | *((CARD16 *) ((a)+1))) : \
>-		     ((*((CARD16 *) (a)) << 8) | *((a)+2)))
>-#define Store24(a,v) ((unsigned long) (a) & 1 ? \
>-		      ((*(a) = (CARD8) ((v) >> 16)), \
>-		       (*((CARD16 *) ((a)+1)) = (CARD16) (v))) : \
>-		      ((*((CARD16 *) (a)) = (CARD16) ((v) >> 8)), \
>-		       (*((a)+2) = (CARD8) (v))))
>-#else
>-#define Fetch24(a)  ((unsigned long) (a) & 1 ? \
>-		     ((*(a)) | (*((CARD16 *) ((a)+1)) << 8)) : \
>-		     ((*((CARD16 *) (a))) | (*((a)+2) << 16)))
>-#define Store24(a,v) ((unsigned long) (a) & 1 ? \
>-		      ((*(a) = (CARD8) (v)), \
>-		       (*((CARD16 *) ((a)+1)) = (CARD16) ((v) >> 8))) : \
>-		      ((*((CARD16 *) (a)) = (CARD16) (v)),\
>-		       (*((a)+2) = (CARD8) ((v) >> 16))))
>-#endif
>-		      
> CARD32
> fbOver (CARD32 x, CARD32 y)
> {
>@@ -99,43 +73,6 @@
>     return m|n|o|p;
> }
> 
>-#define fbComposeGetSolid(pict, bits) { \
>-    FbBits	*__bits__; \
>-    FbStride	__stride__; \
>-    int		__bpp__; \
>-    int		__xoff__,__yoff__; \
>-\
>-    fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
>-    switch (__bpp__) { \
>-    case 32: \
>-	(bits) = *(CARD32 *) __bits__; \
>-	break; \
>-    case 24: \
>-	(bits) = Fetch24 ((CARD8 *) __bits__); \
>-	break; \
>-    case 16: \
>-	(bits) = *(CARD16 *) __bits__; \
>-	(bits) = cvt0565to8888(bits); \
>-	break; \
>-    default: \
>-	return; \
>-    } \
>-    /* manage missing src alpha */ \
>-    if ((pict)->pFormat->direct.alphaMask == 0) \
>-	(bits) |= 0xff000000; \
>-}
>-
>-#define fbComposeGetStart(pict,x,y,type,stride,line,mul) {\
>-    FbBits	*__bits__; \
>-    FbStride	__stride__; \
>-    int		__bpp__; \
>-    int		__xoff__,__yoff__; \
>-\
>-    fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
>-    (stride) = __stride__ * sizeof (FbBits) / sizeof (type); \
>-    (line) = ((type *) __bits__) + (stride) * ((y) - __yoff__) + (mul) * ((x) - __xoff__); \
>-}
>-
> /*
>  * Naming convention:
>  *
>@@ -168,7 +105,7 @@
>     srca = src >> 24;
>     if (src == 0)
> 	return;
>-    
>+
>     fbComposeGetStart (pDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
>     fbComposeGetStart (pMask, xMask, yMask, CARD8, maskStride, maskLine, 1);
>     
>@@ -940,7 +877,12 @@
> 			switch (pDst->format) {
> 			case PICT_r5g6b5:
> 			case PICT_b5g6r5:
>-			    func = fbCompositeSolidMask_nx8x0565;
>+#ifdef USE_GCC34_MMX
>+			    if (fbHaveMMX())
>+				func = fbCompositeSolidMask_nx8x0565mmx;
>+			    else
>+#endif
>+				func = fbCompositeSolidMask_nx8x0565;
> 			    break;
> 			case PICT_r8g8b8:
> 			case PICT_b8g8r8:
>@@ -950,7 +892,12 @@
> 			case PICT_x8r8g8b8:
> 			case PICT_a8b8g8r8:
> 			case PICT_x8b8g8r8:
>-			    func = fbCompositeSolidMask_nx8x8888;
>+#ifdef USE_GCC34_MMX
>+			    if (fbHaveMMX())
>+				func = fbCompositeSolidMask_nx8x8888mmx;
>+			    else
>+#endif
>+				func = fbCompositeSolidMask_nx8x8888;
> 			    break;
> 			}
> 			break;
>@@ -959,10 +906,20 @@
> 			    switch (pDst->format) {
> 			    case PICT_a8r8g8b8:
> 			    case PICT_x8r8g8b8:
>-				func = fbCompositeSolidMask_nx8888x8888C;
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSolidMask_nx8888x8888Cmmx;
>+				else
>+#endif
>+				    func = fbCompositeSolidMask_nx8888x8888C;
> 				break;
> 			    case PICT_r5g6b5:
>-				func = fbCompositeSolidMask_nx8888x0565C;
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSolidMask_nx8888x0565Cmmx;
>+				else
>+#endif
>+				    func = fbCompositeSolidMask_nx8888x0565C;
> 				break;
> 			    }
> 			}
>@@ -972,10 +929,20 @@
> 			    switch (pDst->format) {
> 			    case PICT_a8b8g8r8:
> 			    case PICT_x8b8g8r8:
>-				func = fbCompositeSolidMask_nx8888x8888C;
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSolidMask_nx8888x8888Cmmx;
>+				else
>+#endif
>+				    func = fbCompositeSolidMask_nx8888x8888C;
> 				break;
> 			    case PICT_b5g6r5:
>-				func = fbCompositeSolidMask_nx8888x0565C;
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSolidMask_nx8888x0565Cmmx;
>+				else
>+#endif
>+				    func = fbCompositeSolidMask_nx8888x0565C;
> 				break;
> 			    }
> 			}
>@@ -993,55 +960,145 @@
> 			    func = fbCompositeSolidMask_nx1xn;
> 			    break;
> 			}
>+			break;
>+		    }
>+		}
>+	    }
>+	    else /* has mask and non-repeating source */
>+	    {
>+		if (pSrc->pDrawable == pMask->pDrawable &&
>+		    xSrc == xMask && ySrc == yMask &&
>+		    !pMask->componentAlpha)
>+		{
>+		    switch (pSrc->format) {
>+		    case PICT_x8b8g8r8:
>+			switch (pMask->format) {
>+			case PICT_a8r8g8b8:
>+			case PICT_a8b8g8r8:
>+			    switch (pDst->format) {
>+			    case PICT_a8r8g8b8:
>+			    case PICT_x8r8g8b8:
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSrc_8888RevNPx8888mmx;
>+#endif
>+				break;
>+			    case PICT_r5g6b5:
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSrc_8888RevNPx0565mmx;
>+#endif
>+				break;
>+			    }
>+			    break;
>+			}
>+			break;
>+		    case PICT_x8r8g8b8:
>+			switch (pMask->format) {
>+			case PICT_a8r8g8b8:
>+			case PICT_a8b8g8r8:
>+			    switch (pDst->format) {
>+			    case PICT_a8b8g8r8:
>+			    case PICT_x8b8g8r8:
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSrc_8888RevNPx8888mmx;
>+#endif
>+				break;
>+			    case PICT_r5g6b5:
>+#ifdef USE_GCC34_MMX
>+				if (fbHaveMMX())
>+				    func = fbCompositeSrc_8888RevNPx0565mmx;
>+#endif
>+				break;
>+			    }
>+			    break;
>+			}
>+			break;
> 		    }
>+		    break;
> 		}
> 	    }
> 	}
> 	else
> 	{
>-	    switch (pSrc->format) {
>-	    case PICT_a8r8g8b8:
>-		switch (pDst->format) {
>+	    if (srcRepeat && 
>+		pSrc->pDrawable->width == 1 &&
>+		pSrc->pDrawable->height == 1)
>+	    {
>+		/* no mask and repeating source */
>+		switch (pSrc->format) {
> 		case PICT_a8r8g8b8:
>-		case PICT_x8r8g8b8:
>-		    func = fbCompositeSrc_8888x8888;
>-		    break;
>-		case PICT_r8g8b8:
>-		    func = fbCompositeSrc_8888x0888;
>-		    break;
>-		case PICT_r5g6b5:
>-		    func = fbCompositeSrc_8888x0565;
>+		    switch (pDst->format) {
>+		    case PICT_a8r8g8b8:
>+		    case PICT_x8r8g8b8:
>+#ifdef USE_GCC34_MMX
>+			if (fbHaveMMX())
>+			{
>+			    srcRepeat = FALSE;
>+			    func = fbCompositeSolid_nx8888mmx;
>+			}
>+#endif
>+			break;
>+		    case PICT_r5g6b5:
>+#ifdef USE_GCC34_MMX
>+			if (fbHaveMMX())
>+			{
>+			    srcRepeat = FALSE;
>+			    func = fbCompositeSolid_nx0565mmx;
>+			}
>+#endif
>+			break;
>+		    }
> 		    break;
> 		}
>-		break;
>-	    case PICT_a8b8g8r8:
>-		switch (pDst->format) {
>-		case PICT_a8b8g8r8:
>-		case PICT_x8b8g8r8:
>-		    func = fbCompositeSrc_8888x8888;
>-		    break;
>-		case PICT_b8g8r8:
>-		    func = fbCompositeSrc_8888x0888;
>+	    }
>+	    else
>+	    {
>+		switch (pSrc->format) {
>+		case PICT_a8r8g8b8:
>+		    switch (pDst->format) {
>+		    case PICT_a8r8g8b8:
>+		    case PICT_x8r8g8b8:
>+			func = fbCompositeSrc_8888x8888;
>+			break;
>+		    case PICT_r8g8b8:
>+			func = fbCompositeSrc_8888x0888;
>+			break;
>+		    case PICT_r5g6b5:
>+			func = fbCompositeSrc_8888x0565;
>+			break;
>+		    }
> 		    break;
>-		case PICT_b5g6r5:
>-		    func = fbCompositeSrc_8888x0565;
>+		case PICT_a8b8g8r8:
>+		    switch (pDst->format) {
>+		    case PICT_a8b8g8r8:
>+		    case PICT_x8b8g8r8:
>+			func = fbCompositeSrc_8888x8888;
>+			break;
>+		    case PICT_b8g8r8:
>+			func = fbCompositeSrc_8888x0888;
>+			break;
>+		    case PICT_b5g6r5:
>+			func = fbCompositeSrc_8888x0565;
>+			break;
>+		    }
> 		    break;
>-		}
>-		break;
>-	    case PICT_r5g6b5:
>-		switch (pDst->format) {
> 		case PICT_r5g6b5:
>-		    func = fbCompositeSrc_0565x0565;
>+		    switch (pDst->format) {
>+		    case PICT_r5g6b5:
>+			func = fbCompositeSrc_0565x0565;
>+			break;
>+		    }
> 		    break;
>-		}
>-		break;
>-	    case PICT_b5g6r5:
>-		switch (pDst->format) {
> 		case PICT_b5g6r5:
>-		    func = fbCompositeSrc_0565x0565;
>+		    switch (pDst->format) {
>+		    case PICT_b5g6r5:
>+			func = fbCompositeSrc_0565x0565;
>+			break;
>+		    }
> 		    break;
> 		}
>-		break;
> 	    }
> 	}
> 	break;
>@@ -1052,21 +1109,36 @@
> 	    case PICT_a8r8g8b8:
> 		switch (pDst->format) {
> 		case PICT_a8r8g8b8:
>-		    func = fbCompositeSrcAdd_8888x8888;
>+#ifdef USE_GCC34_MMX
>+		    if (fbHaveMMX())
>+			func = fbCompositeSrcAdd_8888x8888mmx;
>+		    else
>+#endif
>+			func = fbCompositeSrcAdd_8888x8888;
> 		    break;
> 		}
> 		break;
> 	    case PICT_a8b8g8r8:
> 		switch (pDst->format) {
> 		case PICT_a8b8g8r8:
>-		    func = fbCompositeSrcAdd_8888x8888;
>+#ifdef USE_GCC34_MMX
>+		    if (fbHaveMMX())
>+			func = fbCompositeSrcAdd_8888x8888mmx;
>+		    else
>+#endif
>+			func = fbCompositeSrcAdd_8888x8888;
> 		    break;
> 		}
> 		break;
> 	    case PICT_a8:
> 		switch (pDst->format) {
> 		case PICT_a8:
>-		    func = fbCompositeSrcAdd_8000x8000;
>+#ifdef USE_GCC34_MMX
>+		    if (fbHaveMMX())
>+			func = fbCompositeSrcAdd_8000x8000mmx;
>+		    else
>+#endif
>+			func = fbCompositeSrcAdd_8000x8000;
> 		    break;
> 		}
> 		break;
>Index: programs/Xserver/fb/fbpict.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v
>retrieving revision 1.3
>diff -u -r1.3 fbpict.h
>--- programs/Xserver/fb/fbpict.h	12 May 2004 01:49:46 -0000	1.3
>+++ programs/Xserver/fb/fbpict.h	2 Jul 2004 20:13:32 -0000
>@@ -70,6 +70,70 @@
> 				  CARD16     width,
> 				  CARD16     height);
> 
>+#define fbComposeGetSolid(pict, bits) { \
>+    FbBits	*__bits__; \
>+    FbStride	__stride__; \
>+    int		__bpp__; \
>+    int		__xoff__,__yoff__; \
>+\
>+    fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
>+    switch (__bpp__) { \
>+    case 32: \
>+	(bits) = *(CARD32 *) __bits__; \
>+	break; \
>+    case 24: \
>+	(bits) = Fetch24 ((CARD8 *) __bits__); \
>+	break; \
>+    case 16: \
>+	(bits) = *(CARD16 *) __bits__; \
>+	(bits) = cvt0565to8888(bits); \
>+	break; \
>+    default: \
>+	return; \
>+    } \
>+    /* manage missing src alpha */ \
>+    if ((pict)->pFormat->direct.alphaMask == 0) \
>+	(bits) |= 0xff000000; \
>+}
>+
>+#define fbComposeGetStart(pict,x,y,type,stride,line,mul) {\
>+    FbBits	*__bits__; \
>+    FbStride	__stride__; \
>+    int		__bpp__; \
>+    int		__xoff__,__yoff__; \
>+\
>+    fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
>+    (stride) = __stride__ * sizeof (FbBits) / sizeof (type); \
>+    (line) = ((type *) __bits__) + (stride) * ((y) - __yoff__) + (mul) * ((x) - __xoff__); \
>+}
>+#define cvt8888to0565(s)    ((((s) >> 3) & 0x001f) | \
>+			     (((s) >> 5) & 0x07e0) | \
>+			     (((s) >> 8) & 0xf800))
>+#define cvt0565to8888(s)    (((((s) << 3) & 0xf8) | (((s) >> 2) & 0x7)) | \
>+			     ((((s) << 5) & 0xfc00) | (((s) >> 1) & 0x300)) | \
>+			     ((((s) << 8) & 0xf80000) | (((s) << 3) & 0x70000)))
>+
>+#if IMAGE_BYTE_ORDER == MSBFirst
>+#define Fetch24(a)  ((unsigned long) (a) & 1 ? \
>+		     ((*(a) << 16) | *((CARD16 *) ((a)+1))) : \
>+		     ((*((CARD16 *) (a)) << 8) | *((a)+2)))
>+#define Store24(a,v) ((unsigned long) (a) & 1 ? \
>+		      ((*(a) = (CARD8) ((v) >> 16)), \
>+		       (*((CARD16 *) ((a)+1)) = (CARD16) (v))) : \
>+		      ((*((CARD16 *) (a)) = (CARD16) ((v) >> 8)), \
>+		       (*((a)+2) = (CARD8) (v))))
>+#else
>+#define Fetch24(a)  ((unsigned long) (a) & 1 ? \
>+		     ((*(a)) | (*((CARD16 *) ((a)+1)) << 8)) : \
>+		     ((*((CARD16 *) (a))) | (*((a)+2) << 16)))
>+#define Store24(a,v) ((unsigned long) (a) & 1 ? \
>+		      ((*(a) = (CARD8) (v)), \
>+		       (*((CARD16 *) ((a)+1)) = (CARD16) ((v) >> 8))) : \
>+		      ((*((CARD16 *) (a)) = (CARD16) (v)),\
>+		       (*((a)+2) = (CARD8) ((v) >> 16))))
>+#endif
>+		      
>+
> typedef struct _FbCompositeOperand FbCompositeOperand;
> 
> typedef CARD32 (*FbCompositeFetch)(FbCompositeOperand *op);
>Index: programs/Xserver/fb/fbsolid.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbsolid.c,v
>retrieving revision 1.2
>diff -u -r1.2 fbsolid.c
>--- programs/Xserver/fb/fbsolid.c	23 Apr 2004 19:05:14 -0000	1.2
>+++ programs/Xserver/fb/fbsolid.c	2 Jul 2004 20:13:32 -0000
>@@ -49,7 +49,6 @@
> 	return;
>     }
> #endif
>-	
>     dst += dstX >> FB_SHIFT;
>     dstX &= FB_MASK;
>     FbMaskBitsBytes(dstX, width, and == 0, startmask, startbyte,

Actions: View | Splinter Review

Attachments on bug 839: 452 | 453 | 454 | 455

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.