frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure DRIScreenPrivIndex is -1 when no DRI screen private is allocated. 

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11340 .
This commit is contained in:
Michel Dänzer 2007-06-25 10:51:38 +02:00
parent 4c601b904e
commit edb9ccf3ec
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/dri/dri.c
View File

@ -312,12 +312,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
DRIEntPrivPtr pDRIEntPriv; DRIEntPrivPtr pDRIEntPriv;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
if (DRIGeneration != serverGeneration) {
if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
return FALSE;
DRIGeneration = serverGeneration;
}
/* If the DRI extension is disabled, do not initialize the DRI */ /* If the DRI extension is disabled, do not initialize the DRI */
if (noXFree86DRIExtension) { if (noXFree86DRIExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING, DRIDrvMsg(pScreen->myNum, X_WARNING,
@ -347,9 +341,16 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
pDRIEntPriv = DRI_ENT_PRIV(pScrn); pDRIEntPriv = DRI_ENT_PRIV(pScrn);
if (DRIGeneration != serverGeneration) {
if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
return FALSE;
DRIGeneration = serverGeneration;
}
pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec)); pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec));
if (!pDRIPriv) { if (!pDRIPriv) {
pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
DRIScreenPrivIndex = -1;
return FALSE; return FALSE;
} }
@ -623,7 +624,7 @@ DRICloseScreen(ScreenPtr pScreen)
DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn); DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn);
Bool closeMaster; Bool closeMaster;
if (pDRIPriv && pDRIPriv->directRenderingSupport) { if (pDRIPriv) {
pDRIInfo = pDRIPriv->pDriverInfo; pDRIInfo = pDRIPriv->pDriverInfo;
@ -726,6 +727,7 @@ DRICloseScreen(ScreenPtr pScreen)
xfree(pDRIPriv); xfree(pDRIPriv);
pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
DRIScreenPrivIndex = -1;
} }
} }