Commit 9a05f8f7 authored by Keith Packard's avatar Keith Packard

Minor cleanups -- remove a couple of bogus KdCheckSync calls, restructure

    KdOffscreenSwapOut to avoid unneeded 'continue'
parent 16b2ea64
...@@ -262,7 +262,6 @@ kaaDestroyPixmap (PixmapPtr pPixmap) ...@@ -262,7 +262,6 @@ kaaDestroyPixmap (PixmapPtr pPixmap)
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height)); pPixmap->drawable.height));
/* Free the offscreen area */ /* Free the offscreen area */
KdCheckSync (pScreen);
KdOffscreenFree (pKaaPixmap->area); KdOffscreenFree (pKaaPixmap->area);
pPixmap->devPrivate = pKaaPixmap->devPrivate; pPixmap->devPrivate = pKaaPixmap->devPrivate;
pPixmap->devKind = pKaaPixmap->devKind; pPixmap->devKind = pKaaPixmap->devKind;
......
...@@ -71,7 +71,6 @@ static void ...@@ -71,7 +71,6 @@ static void
KdOffscreenKickOut (KdOffscreenArea *area) KdOffscreenKickOut (KdOffscreenArea *area)
{ {
RealOffscreenArea *real_area = (RealOffscreenArea *) area; RealOffscreenArea *real_area = (RealOffscreenArea *) area;
KdCheckSync (area->screen);
if (real_area->save) if (real_area->save)
(*real_area->save) (area); (*real_area->save) (area);
KdOffscreenFree (area); KdOffscreenFree (area);
...@@ -209,14 +208,12 @@ KdOffscreenSwapOut (ScreenPtr pScreen) ...@@ -209,14 +208,12 @@ KdOffscreenSwapOut (ScreenPtr pScreen)
if (!area) if (!area)
break; break;
if (area->area.screen) if (!area->area.screen)
{ {
KdOffscreenKickOut (&area->area); area = area->next;
continue; if (!area)
break;
} }
area = area->next;
if (!area)
break;
assert (area->area.screen); assert (area->area.screen);
KdOffscreenKickOut (&area->area); KdOffscreenKickOut (&area->area);
KdOffscreenValidate (pScreen); KdOffscreenValidate (pScreen);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment