From 9120e58556014e514eef9dfe43cdea4b74dc66ae Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Sat, 12 Jun 2010 00:30:27 +0700 Subject: mi: Remove unused overlay support The only reference to it in server and drivers is in XAA overlay code which would segfault as no miInitOverlay is called ever. No segfaults were observed "in wild", so XAA overlay is probably also unused. XAA code is modified to act as if miOverlayCopyUnderlay always returned false, because XAACopyWindow8_32 could only set doUnderlay to true if it's called from miOverlayMoveWindow or miOverlayResizeWindow, which can only be called if miInitOverlay has hooked those functions, and no driver (on fd.o) or server code calls that. Signed-off-by: Mikhail Gusarov Reviewed-by: Jamey Sharp --- hw/xfree86/xaa/xaaOverlay.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'hw/xfree86/xaa') diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 4b52bf6fd..58c4a58e3 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -16,7 +16,6 @@ #include "xaawrap.h" #include "gcstruct.h" #include "pixmapstr.h" -#include "mioverlay.h" #ifdef PANORAMIX #include "panoramiX.h" @@ -37,7 +36,6 @@ XAACopyWindow8_32( ScreenPtr pScreen = pWin->drawable.pScreen; XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable)); - Bool doUnderlay = miOverlayCopyUnderlay(pScreen); RegionPtr borderClip = &pWin->borderClip; Bool freeReg = FALSE; @@ -56,9 +54,6 @@ XAACopyWindow8_32( pwinRoot = pScreen->root; - if(doUnderlay) - freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip); - RegionNull(&rgnDst); dx = ptOldOrg.x - pWin->drawable.x; @@ -81,7 +76,7 @@ XAACopyWindow8_32( ppt++; pbox++; } - infoRec->ScratchGC.planemask = doUnderlay ? 0x00ffffff : 0xff000000; + infoRec->ScratchGC.planemask = 0xff000000; infoRec->ScratchGC.alu = GXcopy; XAADoBitBlt((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot, @@ -93,25 +88,6 @@ XAACopyWindow8_32( RegionDestroy(borderClip); } -static void -XAASetColorKey8_32( - ScreenPtr pScreen, - int nbox, - BoxPtr pbox -){ - XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); - ScrnInfoPtr pScrn = infoRec->pScrn; - - /* I'm counting on writes being clipped away while switched away. - If this isn't going to be true then I need to be wrapping instead. */ - if(!infoRec->pScrn->vtSema) return; - - (*infoRec->FillSolidRects)(pScrn, pScrn->colorKey << 24, GXcopy, - 0xff000000, nbox, pbox); - - SET_SYNC_FLAG(infoRec); -} - void XAASetupOverlay8_32Planar(ScreenPtr pScreen) { @@ -120,9 +96,6 @@ XAASetupOverlay8_32Planar(ScreenPtr pScreen) pScreen->CopyWindow = XAACopyWindow8_32; - if(!(infoRec->FillSolidRectsFlags & NO_PLANEMASK)) - miOverlaySetTransFunction(pScreen, XAASetColorKey8_32); - infoRec->FullPlanemask = ~0; for(i = 0; i < 32; i++) /* haven't thought about this much */ infoRec->FullPlanemasks[i] = ~0; -- cgit v1.2.3