Commit c468d34c authored by Olivier Fourdan's avatar Olivier Fourdan Committed by Olivier Fourdan
Browse files

glx: Set ContextTag for all contexts

Currently, xorgGlxMakeCurrent() would set the context tag only for
indirect GLX contexts.

However, several other places expect to find a context for the tag or
they would raise a GLXBadContextTag error, such as WaitGL() or WaitX().

Set the context tag for direct contexts as well, to avoid raising an
error and possibly killing the client.

Thanks to Erik Kurzinger <> for spotting the issue.
Signed-off-by: default avatarOlivier Fourdan <>
Reviewed-by: Adam Jackson's avatarAdam Jackson <>
parent 6b47321b
Pipeline #334303 passed with stages
in 4 minutes and 52 seconds
......@@ -664,9 +664,10 @@ xorgGlxMakeCurrent(ClientPtr client, GLXContextTag tag, XID drawId, XID readId,
glxc->currentClient = client;
glxServer.setContextTagPrivate(client, newContextTag, glxc);
glxServer.setContextTagPrivate(client, newContextTag, glxc);
if (prevglxc) {
prevglxc->currentClient = NULL;
if (!prevglxc->idExists) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment