EXA: Don't crash in exaGetImage when swapped out.
This commit is contained in:
parent
3876c6c805
commit
7ac89060e0
|
@ -1324,9 +1324,6 @@ exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h,
|
||||||
int xoff, yoff;
|
int xoff, yoff;
|
||||||
Bool ok;
|
Bool ok;
|
||||||
|
|
||||||
if (pExaScr->swappedOut)
|
|
||||||
goto fallback;
|
|
||||||
|
|
||||||
pixmaps[0].as_dst = FALSE;
|
pixmaps[0].as_dst = FALSE;
|
||||||
pixmaps[0].as_src = TRUE;
|
pixmaps[0].as_src = TRUE;
|
||||||
pixmaps[0].pPix = pPix = exaGetDrawablePixmap (pDrawable);
|
pixmaps[0].pPix = pPix = exaGetDrawablePixmap (pDrawable);
|
||||||
|
@ -1341,6 +1338,9 @@ exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h,
|
||||||
|
|
||||||
REGION_INIT(pScreen, &Reg, &Box, 1);
|
REGION_INIT(pScreen, &Reg, &Box, 1);
|
||||||
|
|
||||||
|
if (pExaScr->swappedOut)
|
||||||
|
goto fallback;
|
||||||
|
|
||||||
exaDoMigration(pixmaps, 1, FALSE);
|
exaDoMigration(pixmaps, 1, FALSE);
|
||||||
|
|
||||||
pPix = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff);
|
pPix = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff);
|
||||||
|
|
Loading…
Reference in New Issue