From 1e29f3ea3eb63cfcb78a463ee0345ec22a013033 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Mar 2020 16:32:56 -0500 Subject: [PATCH] glx: Require screens match for share contexts for classic CreateContext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GLX_ARB_create_context path (with which this should all get unified, someday, sigh) already enforces this, but the classic path does not. It's effectively assumed by the implementation anyway, so let's enforce it rather than do crashy things. Reviewed-by: Michel Dänzer Signed-off-by: Adam Jackson --- glx/glxcmds.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 189b5d913..1e2061d89 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -284,6 +284,15 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, */ isDirect = GL_FALSE; } + + /* Core GLX doesn't explicitly require this, but GLX_ARB_create_context + * does (see glx/createcontext.c), and it's assumed by our + * implementation anyway, so let's be consistent about it. + */ + if (shareglxc->pGlxScreen != pGlxScreen) { + client->errorValue = shareglxc->pGlxScreen->pScreen->myNum; + return BadMatch; + } } /*