From 8b1cd5fbf1b151c4d5f041e392c0cfa519e00217 Mon Sep 17 00:00:00 2001 From: Connor Behan Date: Mon, 10 Aug 2015 20:59:06 -0400 Subject: Remove UploadToScreen and DownloadFromScreen Fixing these broken EXA hooks would make them equal to a software fallback, so use that instead. Signed-off-by: Connor Behan --- src/xgi_accel.c | 107 -------------------------------------------------------- 1 file changed, 107 deletions(-) diff --git a/src/xgi_accel.c b/src/xgi_accel.c index c96af14..736368f 100755 --- a/src/xgi_accel.c +++ b/src/xgi_accel.c @@ -140,9 +140,7 @@ static void Volari_DisableClipping(ScrnInfoPtr pScrn); #ifdef XGI_USE_EXA /* Jong 01/13/2009; support EXA */ void XGIEXASync(ScreenPtr pScreen, int marker); void XGIScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area); -Bool XGIUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch); Bool XGIUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst); -Bool XGIDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch); static Bool XGIPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg); static void XGISolid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2); @@ -787,10 +785,6 @@ Volari_AccelInit(ScreenPtr pScreen) pXGI->EXADriverPtr->Copy = XGICopy; pXGI->EXADriverPtr->DoneCopy = XGIDoneCopy; - /* Upload, download to/from Screen */ - pXGI->EXADriverPtr->UploadToScreen = XGIUploadToScreen; - pXGI->EXADriverPtr->DownloadFromScreen = XGIDownloadFromScreen; - #ifdef XGI_HAVE_COMPOSITE pXGI->EXADriverPtr->CheckComposite = XGICheckComposite; pXGI->EXADriverPtr->PrepareComposite = XGIPrepareComposite; @@ -813,10 +807,6 @@ Volari_AccelInit(ScreenPtr pScreen) pXGI->EXADriverPtr->accel.Copy = XGICopy; pXGI->EXADriverPtr->accel.DoneCopy = XGIDoneCopy; - /* Upload, download to/from Screen */ - pXGI->EXADriverPtr->accel.UploadToScreen = XGIUploadToScreen; - pXGI->EXADriverPtr->accel.DownloadFromScreen = XGIDownloadFromScreen; - #ifdef XGI_HAVE_COMPOSITE pXGI->EXADriverPtr->accel.CheckComposite = XGICheckComposite; pXGI->EXADriverPtr->accel.PrepareComposite = XGIPrepareComposite; @@ -1528,59 +1518,6 @@ void XGIMemCopyFromVideoRam(XGIPtr pXGI, unsigned char *to, unsigned char *from, } } -Bool -XGIUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); - XGIPtr pXGI = XGIPTR(pScrn); - unsigned char *dst = pDst->devPrivate.ptr; - int dst_pitch = exaGetPixmapPitch(pDst); - - int width = w; - int height = h; - - unsigned char * to; - unsigned char * from; - int size; - - PACCELDEBUG(ErrorF("XGIUploadToScreen(dst=0x%x, x=%d, y=%d, w=%d, h=%d, src=0x%x, src_pitch=%d)...\n", - dst, x, y, w, h, src, src_pitch)); - /* DisableDrawingFunctionDynamically(TRUE); */ - - Volari_Sync(pScrn); - DisableDrawingFunctionDynamically(TRUE); - - if(pDst->drawable.bitsPerPixel < 8) - return FALSE; - - dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * dst_pitch); - - size = src_pitch < dst_pitch ? src_pitch : dst_pitch; - - int BytePerPixel = pDst->drawable.bitsPerPixel / 8; - - /* DisableDrawingFunctionDynamically(TRUE); */ - - /* Jong Lin; It would be wrong if (x,y) != (0,0) */ - if((dst_pitch == src_pitch) && (dst_pitch/BytePerPixel == w) && (x == 0) && (y == 0)) - { - XGIMemCopyToVideoRam(pXGI, dst, (unsigned char *)src, - w*(pDst->drawable.bitsPerPixel/8)*h); - } - else - { - while(h--) { - XGIMemCopyToVideoRam(pXGI, dst, (unsigned char *)src, - (w * pDst->drawable.bitsPerPixel / 8)); - - src += src_pitch; - dst += dst_pitch; - } - } - - return TRUE; -} - Bool XGIUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) { @@ -1659,50 +1596,6 @@ XGIUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) return TRUE; } -Bool -XGIDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pSrc->drawable.pScreen); - XGIPtr pXGI = XGIPTR(pScrn); - unsigned char *src = pSrc->devPrivate.ptr; - int src_pitch = exaGetPixmapPitch(pSrc); - int size = src_pitch < dst_pitch ? src_pitch : dst_pitch; - - /* Jong 02/13/2009; quit X while opening console terminal */ - /* return(FALSE); */ - /* DisableDrawingFunctionDynamically(TRUE); */ - - Volari_Sync(pScrn); - DisableDrawingFunctionDynamically(TRUE); - - if(pSrc->drawable.bitsPerPixel < 8) - return FALSE; - - src += (x * pSrc->drawable.bitsPerPixel / 8) + (y * src_pitch); - - int BytePerPixel = pSrc->drawable.bitsPerPixel / 8; - - /* DisableDrawingFunctionDynamically(TRUE); */ - - if((src_pitch == dst_pitch) && (dst_pitch/BytePerPixel == w) && (x == 0) && (y == 0)) - { - PDEBUG(ErrorF("src_pitch == dst_pitch...\n")); - XGIMemCopyFromVideoRam(pXGI, (unsigned char *)dst, src, - (w * pSrc->drawable.bitsPerPixel / 8)*h); - } - else - { - while(h--) { - XGIMemCopyFromVideoRam(pXGI, (unsigned char *)dst, src, - (w * pSrc->drawable.bitsPerPixel / 8)); - src += src_pitch; - dst += dst_pitch; - } - } - - return TRUE; -} - void XGIScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area) { XGIPtr pXGI = XGIPTR(xf86ScreenToScrn(pScreen)); -- cgit v1.2.3