Revert "composite: Don't backfill non-MapWindow allocations"
This reverts commitdb8840600e
. It was an optimization for the resize case, but193ecc8b45
made it so that no backfilling takes place on resize if left in. Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Conflicts: composite/compalloc.c Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
e87adcc9e0
commit
f1d75f3b74
|
@ -557,7 +557,7 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
|
||||||
}
|
}
|
||||||
|
|
||||||
static PixmapPtr
|
static PixmapPtr
|
||||||
compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
|
compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||||
WindowPtr pParent = pWin->parent;
|
WindowPtr pParent = pWin->parent;
|
||||||
|
@ -572,10 +572,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
|
||||||
pPixmap->screen_x = x;
|
pPixmap->screen_x = x;
|
||||||
pPixmap->screen_y = y;
|
pPixmap->screen_y = y;
|
||||||
|
|
||||||
/* resize allocations will update later in compCopyWindow, not here */
|
|
||||||
if (!map)
|
|
||||||
return pPixmap;
|
|
||||||
|
|
||||||
if (pParent->drawable.depth == pWin->drawable.depth)
|
if (pParent->drawable.depth == pWin->drawable.depth)
|
||||||
{
|
{
|
||||||
GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen);
|
GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen);
|
||||||
|
@ -641,7 +637,7 @@ compAllocPixmap (WindowPtr pWin)
|
||||||
int y = pWin->drawable.y - bw;
|
int y = pWin->drawable.y - bw;
|
||||||
int w = pWin->drawable.width + (bw << 1);
|
int w = pWin->drawable.width + (bw << 1);
|
||||||
int h = pWin->drawable.height + (bw << 1);
|
int h = pWin->drawable.height + (bw << 1);
|
||||||
PixmapPtr pPixmap = compNewPixmap (pWin, x, y, w, h, TRUE);
|
PixmapPtr pPixmap = compNewPixmap (pWin, x, y, w, h);
|
||||||
CompWindowPtr cw = GetCompWindow (pWin);
|
CompWindowPtr cw = GetCompWindow (pWin);
|
||||||
|
|
||||||
if (!pPixmap)
|
if (!pPixmap)
|
||||||
|
@ -713,7 +709,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
|
||||||
pix_h = h + (bw << 1);
|
pix_h = h + (bw << 1);
|
||||||
if (pix_w != pOld->drawable.width || pix_h != pOld->drawable.height)
|
if (pix_w != pOld->drawable.width || pix_h != pOld->drawable.height)
|
||||||
{
|
{
|
||||||
pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h, FALSE);
|
pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h);
|
||||||
if (!pNew)
|
if (!pNew)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
cw->pOldPixmap = pOld;
|
cw->pOldPixmap = pOld;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user