Attachment 8422 Details for Bug 9682 – Implement fbCompositeSrc_8888x0565mmx

[patch] Implement fbCompositeSrc_8888x0565mmx

fbCompositeSrc_8888x0565.patch (text/plain), 4.43 KB, created by Dan Williams on 2007-01-16 20:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2007-01-16 20:10:11 UTC

Size: 4.43 KB

patch

obsolete

>diff --git a/fb/fbmmx.c b/fb/fbmmx.c
>index f74930a..b6c63fa 100644
>--- a/pixman/src/fbmmx.c
>+++ b/pixman/src/fbmmx.c
>@@ -1339,6 +1339,128 @@ fbCompositeSrc_8888x8888mmx (CARD8	op,
> }
> 
> void
>+fbCompositeSrc_8888x0565mmx (CARD8      op,
>+			     PicturePtr pSrc,
>+			     PicturePtr pMask,
>+			     PicturePtr pDst,
>+			     INT16      xSrc,
>+			     INT16      ySrc,
>+			     INT16      xMask,
>+			     INT16      yMask,
>+			     INT16      xDst,
>+			     INT16      yDst,
>+			     CARD16     width,
>+			     CARD16     height)
>+{
>+    CARD16	*dstLine, *dst;
>+    CARD32	*srcLine, *src;
>+    FbStride	dstStride, srcStride;
>+    CARD16	w;
>+    
>+    CHECKPOINT();
>+    
>+    fbComposeGetStart (pDst, xDst, yDst, CARD16, dstStride, dstLine, 1);
>+    fbComposeGetStart (pSrc, xSrc, ySrc, CARD32, srcStride, srcLine, 1);
>+    
>+    assert (pSrc->pDrawable == pMask->pDrawable);
>+    
>+    while (height--)
>+    {
>+	dst = dstLine;
>+	dstLine += dstStride;
>+	src = srcLine;
>+	srcLine += srcStride;
>+	w = width;
>+	
>+	CHECKPOINT();
>+	
>+	while (w && (unsigned long)dst & 7)
>+	{
>+	    __m64 vsrc = load8888 (*src);
>+	    ullong d = *dst;
>+	    __m64 vdest = expand565 ((__m64)d, 0);
>+	    
>+	    vdest = pack565(over(vsrc, expand_alpha(vsrc), vdest), vdest, 0);
>+	    
>+	    *dst = (ullong)vdest;
>+	    
>+	    w--;
>+	    dst++;
>+	    src++;
>+	}
>+	
>+	CHECKPOINT();
>+	
>+	while (w >= 4)
>+	{
>+	    CARD32 s0, s1, s2, s3;
>+	    unsigned char a0, a1, a2, a3;
>+	    __m64 vsrc0, vsrc1, vsrc2, vsrc3;
>+	    
>+	    s0 = *src;
>+	    s1 = *(src + 1);
>+	    s2 = *(src + 2);
>+	    s3 = *(src + 3);
>+	    
>+	    a0 = (s0 >> 24);
>+	    a1 = (s1 >> 24);
>+	    a2 = (s2 >> 24);
>+	    a3 = (s3 >> 24);
>+	    
>+	    vsrc0 = load8888(s0);
>+	    vsrc1 = load8888(s1);
>+	    vsrc2 = load8888(s2);
>+	    vsrc3 = load8888(s3);
>+
>+	    if ((a0 & a1 & a2 & a3) == 0xFF)
>+	    {
>+		__m64 vdest;
>+		vdest = pack565(vsrc0, _mm_setzero_si64(), 0);
>+		vdest = pack565(vsrc1, vdest, 1);
>+		vdest = pack565(vsrc2, vdest, 2);
>+		vdest = pack565(vsrc3, vdest, 3);
>+		
>+		*(__m64 *)dst = vdest;
>+	    }
>+	    else if (a0 | a1 | a2 | a3)
>+	    {
>+		__m64 vdest = *(__m64 *)dst;
>+		
>+		vdest = pack565(over(vsrc0, expand_alpha(vsrc0), expand565(vdest, 0)), vdest, 0);
>+	        vdest = pack565(over(vsrc1, expand_alpha(vsrc1), expand565(vdest, 1)), vdest, 1);
>+		vdest = pack565(over(vsrc2, expand_alpha(vsrc2), expand565(vdest, 2)), vdest, 2);
>+		vdest = pack565(over(vsrc3, expand_alpha(vsrc3), expand565(vdest, 3)), vdest, 3);
>+		
>+		*(__m64 *)dst = vdest;
>+	    }
>+	    
>+	    w -= 4;
>+	    dst += 4;
>+	    src += 4;
>+	}
>+	
>+	CHECKPOINT();
>+	
>+	while (w)
>+	{
>+	    __m64 vsrc = load8888 (*src);
>+	    ullong d = *dst;
>+	    __m64 vdest = expand565 ((__m64)d, 0);
>+	    
>+	    vdest = pack565(over(vsrc, expand_alpha(vsrc), vdest), vdest, 0);
>+	    
>+	    *dst = (ullong)vdest;
>+	    
>+	    w--;
>+	    dst++;
>+	    src++;
>+	}
>+    }
>+    
>+    _mm_empty();
>+}
>+
>+void
> fbCompositeSolidMask_nx8x8888mmx (CARD8      op,
> 				  PicturePtr pSrc,
> 				  PicturePtr pMask,
>diff --git a/fb/fbmmx.h b/fb/fbmmx.h
>index 34718e3..b3e4d71 100644
>--- a/pixman/src/fbmmx.h
>+++ b/pixman/src/fbmmx.h
>@@ -130,6 +130,18 @@ void fbCompositeSrc_8888RevNPx8888mmx (CARD8      op,
> 				       INT16      yDst,
> 				       CARD16     width,
> 				       CARD16     height);
>+void fbCompositeSrc_8888x0565mmx (CARD8      op,
>+				  PicturePtr pSrc,
>+				  PicturePtr pMask,
>+				  PicturePtr pDst,
>+				  INT16      xSrc,
>+				  INT16      ySrc,
>+				  INT16      xMask,
>+				  INT16      yMask,
>+				  INT16      xDst,
>+				  INT16      yDst,
>+				  CARD16     width,
>+				  CARD16     height);
> void fbCompositeSrc_8888RevNPx0565mmx (CARD8      op,
> 				       PicturePtr pSrc,
> 				       PicturePtr pMask,
>diff --git a/fb/fbpict.c b/fb/fbpict.c
>index 28503c0..aaaf87d 100644
>--- a/pixman/src/fbpict.c
>+++ b/pixman/src/fbpict.c
>@@ -1175,7 +1175,12 @@ fbComposite (CARD8      op,
> 			func = fbCompositeSrc_8888x0888;
> 			break;
> 		    case PICT_r5g6b5:
>-			func = fbCompositeSrc_8888x0565;
>+#ifdef USE_MMX
>+			if (fbHaveMMX())
>+			    func = fbCompositeSrc_8888x0565mmx;
>+			else
>+#endif
>+			    func = fbCompositeSrc_8888x0565;
> 			break;
> 		    default:
> 			break;
>@@ -1221,7 +1226,12 @@ fbComposite (CARD8      op,
> 			func = fbCompositeSrc_8888x0888;
> 			break;
> 		    case PICT_b5g6r5:
>-			func = fbCompositeSrc_8888x0565;
>+#ifdef USE_MMX
>+			if (fbHaveMMX())
>+			    func = fbCompositeSrc_8888x0565mmx;
>+			else
>+#endif
>+			    func = fbCompositeSrc_8888x0565;
> 			break;
> 		    default:
> 			break;

Actions: View | Splinter Review

Attachments on bug 9682: 8422 | 8625

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.