From 747564ab091090a3eaf42186c7b284b940b70e13 Mon Sep 17 00:00:00 2001 From: Semjon Kravtsenko Date: Wed, 21 Jun 2023 10:50:44 +0300 Subject: [PATCH] glx: Assign unique serial number to GLXBadFBConfig error Fixes: e89e1f5049d ("glx: Fix error handling yet again in CreateContextAttribs") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9171 Tested-by: yan12125 Co-authored-by: XRevan86 Part-of: (cherry picked from commit 39824457283bf194c2e2773c19708848027121e1) --- .pick_status.json | 2 +- src/glx/create_context.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e41543f50d3..26da28d777c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,7 @@ "description": "glx: Assign unique serial number to GLXBadFBConfig error", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e89e1f5049d3b78542fcd69b7d6106dd4bdafc39" }, diff --git a/src/glx/create_context.c b/src/glx/create_context.c index f89ceec30be..1c2bbb1cfd1 100644 --- a/src/glx/create_context.c +++ b/src/glx/create_context.c @@ -115,6 +115,11 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, #endif if (gc == NULL) { + /* Increment dpy->request in order to give a unique serial number to the error. + * This may break creating contexts on some video cards, if libx11 <1.7.4 is used. + * However, this fixes creating contexts (on some video cards) if libx11 >=1.7.4 is used. + */ + XNoOp(dpy); /* -1 isn't a legal XID, which is sort of the point, we've failed * before we even got to XID allocation. */