From c468d34c7208c9041f9c077b54a00ae9cccad6a3 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 3 Jun 2021 17:51:01 +0200 Subject: [PATCH] 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: Olivier Fourdan Reviewed-by: Adam Jackson --- glx/glxcmds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 2f69c794a..3f1bb9a71 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -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) {