EXA: Only mark offscreen memory as used when it really is.
This commit is contained in:
parent
0958505961
commit
c19f227b46
|
@ -620,7 +620,6 @@ exaDoMigration (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
|
||||||
/* Now, try to move them all into FB */
|
/* Now, try to move them all into FB */
|
||||||
for (i = 0; i < npixmaps; i++) {
|
for (i = 0; i < npixmaps; i++) {
|
||||||
exaMoveInPixmap(pixmaps[i].pPix);
|
exaMoveInPixmap(pixmaps[i].pPix);
|
||||||
ExaOffscreenMarkUsed (pixmaps[i].pPix);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we couldn't fit everything in, then kick back out */
|
/* If we couldn't fit everything in, then kick back out */
|
||||||
|
@ -631,8 +630,13 @@ exaDoMigration (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
|
||||||
pixmaps[i].pPix->drawable.height));
|
pixmaps[i].pPix->drawable.height));
|
||||||
for (j = 0; j < npixmaps; j++)
|
for (j = 0; j < npixmaps; j++)
|
||||||
exaMoveOutPixmap(pixmaps[j].pPix);
|
exaMoveOutPixmap(pixmaps[j].pPix);
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Yay, everything's offscreen, mark memory as used */
|
||||||
|
for (i = 0; i < npixmaps; i++) {
|
||||||
|
ExaOffscreenMarkUsed (pixmaps[i].pPix);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue