andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glx: Clean up more thoroughly if the drawable of a current context goes away.

Browse Source 
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
This commit is contained in:
Michel Dänzer 2009-06-23 16:45:40 +02:00
parent df597709d7
commit 3020b1d43e
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glx/glxext.c
View File

@ -128,8 +128,31 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
for (c = glxAllContexts; c; c = c->next) {
if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
int i;
(*c->loseCurrent)(c);
__glXFlushContextCache();
c->isCurrent = GL_FALSE;
if (c == __glXLastContext)
__glXFlushContextCache();
for (i = 1; i < currentMaxClients; i++) {
if (clients[i]) {
__GLXclientState *cl = glxGetClient(clients[i]);
if (cl->inUse) {
int j;
for (j = 0; j < cl->numCurrentContexts; j++) {
if (cl->currentContexts[j] == c)
cl->currentContexts[j] = NULL;
}
}
}
}
if (!c->idExists) {
__glXFreeContext(c);
}
}
if (c->drawPriv == glxPriv)
c->drawPriv = NULL;