fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 00:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge.

Browse source
This commit is contained in:
José Fonseca 2007-10-06 18:32:10 +01:00
parent d4653198dd
commit 498020054a
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hw/xfree86/dri/dri.c
View file

@ -1367,7 +1367,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
/* track this in case the client dies */
AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
(pointer)pPixmap);
(pointer)pDrawable->id);
if (pDRIDrawablePriv->hwDrawable)
*hHWDrawable = pDRIDrawablePriv->hwDrawable;
@ -1434,10 +1434,9 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
(pointer)pDrawable->id);
}
else if (pDrawable->type == DRAWABLE_PIXMAP) {
PixmapPtr pPixmap = (PixmapPtr)pDrawable;
LookupClientResourceComplex(client, DRIDrawablePrivResType,
DRIDestroyDrawableCB,
(pointer)pPixmap);
(pointer)pDrawable->id);
}
else { /* for GLX 1.3, a PBuffer */
/* NOT_DONE */
@ -1471,9 +1470,17 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
pPixmap = LookupIDByType(id, RT_PIXMAP);
if (pPixmap) {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pPixmap->drawable.pScreen);
DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPixmap);
ScreenPtr pScreen;
DRIScreenPrivPtr pDRIPriv;
if (!pDRIDrawablePriv)
return FALSE;
pScreen = pPixmap->drawable.pScreen;
pDRIPriv = DRI_SCREEN_PRIV(pScreen);
if (--pDRIDrawablePriv->refCount == 0) {
if (pDRIDrawablePriv->drawableIndex != -1) {
/* bump stamp to force outstanding 3D requests to resync */
pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
@ -1483,16 +1490,15 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
}
if (drmDestroyDrawable(pDRIPriv->drmFD,
pDRIDrawablePriv->hwDrawable)) {
return FALSE;
}
drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable);
xfree(pDRIDrawablePriv);
pPixmap->devPrivates[DRIPixmapPrivIndex].ptr = NULL;
}
{ /* or for GLX 1.3, a PBuffer */
return TRUE;
}
else { /* or for GLX 1.3, a PBuffer */
/* NOT_DONE */
return FALSE;
}