andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86/xv: Eliminate two open coded copies of xf86XVRemovePortFromWindow

Browse Source 
No functional change.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
This commit is contained in:
Ville Syrjälä 2010-10-29 16:39:13 +03:00
parent b02858b5af
commit 0178173f05
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xfree86/common/xf86xv.c
View File

@ -1048,7 +1048,6 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen); XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin); XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
XF86XVWindowPtr pPrev;
XvPortRecPrivatePtr pPriv; XvPortRecPrivatePtr pPriv;
Bool AreasExposed; Bool AreasExposed;
@ -1061,8 +1060,6 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
/* filter out XClearWindow/Area */ /* filter out XClearWindow/Area */
if (!pWin->valdata) return; if (!pWin->valdata) return;
pPrev = NULL;
while(WinPriv) { while(WinPriv) {
pPriv = WinPriv->PortRec; pPriv = WinPriv->PortRec;
@ -1079,28 +1076,18 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
if (pPriv->AdaptorRec->ReputImage) if (pPriv->AdaptorRec->ReputImage)
xf86XVReputImage(pPriv); xf86XVReputImage(pPriv);
else if(AreasExposed) { else if(AreasExposed) {
XF86XVWindowPtr tmp;
if (pPriv->isOn == XV_ON) { if (pPriv->isOn == XV_ON) {
(*pPriv->AdaptorRec->StopVideo)( (*pPriv->AdaptorRec->StopVideo)(
pPriv->pScrn, pPriv->DevPriv.ptr, FALSE); pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
pPriv->isOn = XV_PENDING; pPriv->isOn = XV_PENDING;
} }
pPriv->pDraw = NULL;
if(!pPrev)
dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
WinPriv->next);
else
pPrev->next = WinPriv->next;
tmp = WinPriv;
WinPriv = WinPriv->next; WinPriv = WinPriv->next;
free(tmp); xf86XVRemovePortFromWindow(pWin, pPriv);
continue; continue;
} }
break; break;
} }
pPrev = WinPriv;
WinPriv = WinPriv->next; WinPriv = WinPriv->next;
} }
} }
@ -1112,7 +1099,6 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen); XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin); XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
XF86XVWindowPtr tmp, pPrev = NULL;
XvPortRecPrivatePtr pPriv; XvPortRecPrivatePtr pPriv;
Bool visible = (pWin->visibility == VisibilityUnobscured) || Bool visible = (pWin->visibility == VisibilityUnobscured) ||
(pWin->visibility == VisibilityPartiallyObscured); (pWin->visibility == VisibilityPartiallyObscured);
@ -1140,21 +1126,12 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
} }
if(!pPriv->type) { /* overlaid still/image */ if(!pPriv->type) { /* overlaid still/image */
pPriv->pDraw = NULL;
if(!pPrev)
dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
WinPriv->next);
else
pPrev->next = WinPriv->next;
tmp = WinPriv;
WinPriv = WinPriv->next; WinPriv = WinPriv->next;
free(tmp); xf86XVRemovePortFromWindow(pWin, pPriv);
continue; continue;
} }
} }
pPrev = WinPriv;
WinPriv = WinPriv->next; WinPriv = WinPriv->next;
} }