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

Merge remote-tracking branch 'jturney/indirect-glx-fixes'

This commit is contained in:
Keith Packard 2014-12-08 18:07:55 -08:00
parent 6f4c398a0e bc71081f0e
commit 3e7218a6c2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxcmds.c
View File

@ -413,7 +413,9 @@ __glXDisp_DestroyContext(__GLXclientState * cl, GLbyte * pc)
&glxc, &err)) &glxc, &err))
return err; return err;
FreeResourceByType(req->context, __glXContextRes, FALSE); glxc->idExists = GL_FALSE;
if (!glxc->currentClient)
FreeResourceByType(req->context, __glXContextRes, FALSE);
return Success; return Success;
} }

8
glx/glxext.c
View File

@ -66,6 +66,7 @@ static DevPrivateKeyRec glxClientPrivateKeyRec;
** Forward declarations. ** Forward declarations.
*/ */
static int __glXDispatch(ClientPtr); static int __glXDispatch(ClientPtr);
static GLboolean __glXFreeContext(__GLXcontext * cx);
/* /*
** Called when the extension is reset. ** Called when the extension is reset.
@ -133,6 +134,9 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
next = c->next; next = c->next;
if (c->currentClient && if (c->currentClient &&
(c->drawPriv == glxPriv || c->readPriv == glxPriv)) { (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
/* flush the context */
glFlush();
c->hasUnflushedCommands = GL_FALSE;
/* just force a re-bind the next time through */ /* just force a re-bind the next time through */
(*c->loseCurrent) (c); (*c->loseCurrent) (c);
lastGLContext = NULL; lastGLContext = NULL;
@ -186,7 +190,7 @@ __glXRemoveFromContextList(__GLXcontext * cx)
/* /*
** Free a context. ** Free a context.
*/ */
GLboolean static GLboolean
__glXFreeContext(__GLXcontext * cx) __glXFreeContext(__GLXcontext * cx)
{ {
if (cx->idExists || cx->currentClient) if (cx->idExists || cx->currentClient)
@ -291,7 +295,7 @@ glxClientCallback(CallbackListPtr *list, void *closure, void *data)
c->loseCurrent(c); c->loseCurrent(c);
lastGLContext = NULL; lastGLContext = NULL;
c->currentClient = NULL; c->currentClient = NULL;
__glXFreeContext(c); FreeResourceByType(c->id, __glXContextRes, FALSE);
} }
} }

1
glx/glxext.h
View File

@ -51,7 +51,6 @@
#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 #define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1
#endif #endif
extern GLboolean __glXFreeContext(__GLXcontext * glxc);
extern void __glXFlushContextCache(void); extern void __glXFlushContextCache(void);
extern Bool __glXAddContext(__GLXcontext * cx); extern Bool __glXAddContext(__GLXcontext * cx);