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

Merge branch 'server-1.5-branch' into xorg-server-1.5-apple

Browse source
This commit is contained in:
Jeremy Huddleston 2008-04-24 18:26:09 -07:00
commit 7ee34a69f3
2 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GL/glx/glxglcore.c
View file

@ -432,6 +432,7 @@ __glXMesaScreenProbe(ScreenPtr pScreen)
screen->base.destroy = __glXMesaScreenDestroy; screen->base.destroy = __glXMesaScreenDestroy;
screen->base.createContext = __glXMesaScreenCreateContext; screen->base.createContext = __glXMesaScreenCreateContext;
screen->base.createDrawable = __glXMesaScreenCreateDrawable; screen->base.createDrawable = __glXMesaScreenCreateDrawable;
screen->base.swapInterval = NULL;
screen->base.pScreen = pScreen; screen->base.pScreen = pScreen;
return &screen->base; return &screen->base;

58
GL/glx/glxutil.c
View file

@ -81,38 +81,40 @@ __glXDeassociateContext(__GLXcontext *glxc)
__GLXcontext *curr, *prev; __GLXcontext *curr, *prev;
prev = NULL; prev = NULL;
for ( curr = glxc->drawPriv->drawGlxc if (glxc->drawPriv) {
; curr != NULL for ( curr = glxc->drawPriv->drawGlxc; curr != NULL
; prev = curr, curr = curr->nextDrawPriv ) { ; prev = curr, curr = curr->nextDrawPriv ) {
if (curr == glxc) { if (curr == glxc) {
/* found context. Deassociate. */ /* found context. Deassociate. */
if (prev == NULL) { if (prev == NULL) {
glxc->drawPriv->drawGlxc = curr->nextDrawPriv; glxc->drawPriv->drawGlxc = curr->nextDrawPriv;
} else { } else {
prev->nextDrawPriv = curr->nextDrawPriv; prev->nextDrawPriv = curr->nextDrawPriv;
}
curr->nextDrawPriv = NULL;
__glXUnrefDrawable(glxc->drawPriv);
break;
} }
curr->nextDrawPriv = NULL; }
__glXUnrefDrawable(glxc->drawPriv);
break;
}
} }
prev = NULL; prev = NULL;
for ( curr = glxc->readPriv->readGlxc if (glxc->readPriv) {
; curr != NULL for ( curr = glxc->readPriv->readGlxc
; prev = curr, curr = curr->nextReadPriv ) { ; curr != NULL
if (curr == glxc) { ; prev = curr, curr = curr->nextReadPriv ) {
/* found context. Deassociate. */ if (curr == glxc) {
if (prev == NULL) { /* found context. Deassociate. */
glxc->readPriv->readGlxc = curr->nextReadPriv; if (prev == NULL) {
} else { glxc->readPriv->readGlxc = curr->nextReadPriv;
prev->nextReadPriv = curr->nextReadPriv; } else {
} prev->nextReadPriv = curr->nextReadPriv;
curr->nextReadPriv = NULL; }
__glXUnrefDrawable(glxc->readPriv); curr->nextReadPriv = NULL;
break; __glXUnrefDrawable(glxc->readPriv);
} break;
}
}
} }
} }