mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-01-08 15:20:15 +01:00
oops. Failed to set window offsets in kaaGetOffscreenPixmap
Initialized shadow too early; acceleration stomped damage
This commit is contained in:
parent
52ada03edb
commit
f2f8347001
2 changed files with 12 additions and 13 deletions
|
|
@ -232,9 +232,6 @@ kaaPixmapUseMemory (PixmapPtr pPixmap)
|
|||
static Bool
|
||||
kaaDestroyPixmap (PixmapPtr pPixmap)
|
||||
{
|
||||
ScreenPtr pScreen = pPixmap->drawable.pScreen;
|
||||
Bool ret;
|
||||
|
||||
if (pPixmap->refcnt == 1)
|
||||
{
|
||||
KaaPixmapPriv (pPixmap);
|
||||
|
|
@ -251,10 +248,7 @@ kaaDestroyPixmap (PixmapPtr pPixmap)
|
|||
pPixmap->devKind = pKaaPixmap->devKind;
|
||||
}
|
||||
}
|
||||
|
||||
ret = fbDestroyPixmap (pPixmap);
|
||||
|
||||
return ret;
|
||||
return fbDestroyPixmap (pPixmap);
|
||||
}
|
||||
|
||||
static PixmapPtr
|
||||
|
|
@ -304,17 +298,19 @@ static PixmapPtr
|
|||
kaaGetOffscreenPixmap (DrawablePtr pDrawable, int *xp, int *yp)
|
||||
{
|
||||
PixmapPtr pPixmap;
|
||||
int x = 0, y = 0;
|
||||
int x, y;
|
||||
|
||||
if (pDrawable->type == DRAWABLE_WINDOW) {
|
||||
pPixmap = (*pDrawable->pScreen->GetWindowPixmap) ((WindowPtr) pDrawable);
|
||||
if (x)
|
||||
x += pDrawable->x;
|
||||
if (y)
|
||||
y += pDrawable->y;
|
||||
x = pDrawable->x;
|
||||
y = pDrawable->y;
|
||||
}
|
||||
else
|
||||
{
|
||||
pPixmap = (PixmapPtr) pDrawable;
|
||||
x = 0;
|
||||
y = 0;
|
||||
}
|
||||
if (kaaPixmapIsOffscreen (pPixmap))
|
||||
{
|
||||
x += pPixmap->drawable.x;
|
||||
|
|
|
|||
|
|
@ -1334,7 +1334,7 @@ vesaRandRInit (ScreenPtr pScreen)
|
|||
Bool
|
||||
vesaInitScreen(ScreenPtr pScreen)
|
||||
{
|
||||
return shadowSetup (pScreen);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Bool
|
||||
|
|
@ -1344,6 +1344,9 @@ vesaFinishInitScreen (ScreenPtr pScreen)
|
|||
|
||||
vesaConfigureScreen (pScreen);
|
||||
|
||||
if (!shadowSetup (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pPixmap = vesaGetPixmap (pScreen);
|
||||
if (!pPixmap)
|
||||
return FALSE;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue