summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-06-23 14:45:40 (GMT)
committerMichel Dänzer <daenzer@vmware.com>2009-06-23 14:45:40 (GMT)
commit3020b1d43e34fca08cd51f7c7c8ed51497d49ef3 (patch)
tree3d3c85fedf1fd0891c543efabd4405cdaf76122f
parentdf597709d71f47b8516e27c6fb1bfffd59de5e48 (diff)
glx: Clean up more thoroughly if the drawable of a current context goes away.
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
-rw-r--r--glx/glxext.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/glx/glxext.c b/glx/glxext.c
index 520eb2e..a571ec9 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -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;