[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit cbbb356da7f4384c812c9db230657097992da1e7
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Sun Jul 26 23:33:29 2009 +0100

    Cannot accelerate these

diff --git a/src/glamo-kms-exa.c b/src/glamo-kms-exa.c
index 8704ac3..8e31a22 100644
--- a/src/glamo-kms-exa.c
+++ b/src/glamo-kms-exa.c
@@ -332,50 +332,14 @@ void GlamoKMSExaDoneComposite(PixmapPtr pDst)
 Bool GlamoKMSExaUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
                                char *src, int src_pitch)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
-	GlamoPtr pGlamo = GlamoPTR(pScrn);
-	int bpp, i;
-	CARD8 *dst_offset;
-	int dst_pitch;
-
-	bpp = pDst->drawable.bitsPerPixel / 8;
-	dst_pitch = pDst->devKind;
-	dst_offset = pGlamo->exa->memoryBase + exaGetPixmapOffset(pDst)
-						+ x*bpp + y*dst_pitch;
-
-	for (i = 0; i < h; i++) {
-		memcpy(dst_offset, src, w*bpp);
-		dst_offset += dst_pitch;
-		src += src_pitch;
-	}
-
-	return TRUE;
+	return FALSE;
 }
 
 
 Bool GlamoKMSExaDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
                                    char *dst, int dst_pitch)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-	GlamoPtr pGlamo = GlamoPTR(pScrn);
-	int bpp, i;
-	CARD8 *dst_offset, *src;
-	int src_pitch;
-
-	bpp = pSrc->drawable.bitsPerPixel;
-	bpp /= 8;
-	src_pitch = pSrc->devKind;
-	src = pGlamo->exa->memoryBase + exaGetPixmapOffset(pSrc) +
-						x*bpp + y*src_pitch;
-	dst_offset = (unsigned char*)dst;
-
-	for (i = 0; i < h; i++) {
-		memcpy(dst_offset, src, w*bpp);
-		dst_offset += dst_pitch;
-		src += src_pitch;
-	}
-
-	return TRUE;
+	return FALSE;
 }
 
 
@@ -579,6 +543,7 @@ void GlamoKMSExaInit(ScrnInfoPtr pScrn)
 
 	exa->DownloadFromScreen = GlamoKMSExaDownloadFromScreen;
 	exa->UploadToScreen = GlamoKMSExaUploadToScreen;
+	exa->UploadToScratch = NULL;
 
 //	exa->MarkSync = GlamoKMSExaMarkSync;
 	exa->WaitMarker = GlamoKMSExaWaitMarker;

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org