From bd42f62b0fcca796990e4eeca7c1595563c0fd53 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 8 Mar 2026 22:58:57 +1100 Subject: [PATCH] glx: guard glx_screen frontend_screen member MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guards workaround code with the same conditions as glx_screen`s frontend_screen member. Reviewed-by: Marek Olšák Fixes: 67eeee43e07d ("driconf: add a way to override GLX_CONTEXT_RESET_ISOLATION_BIT_ARB") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/15021 Part-of: --- src/glx/create_context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glx/create_context.c b/src/glx/create_context.c index ef314d3c439..908b8968047 100644 --- a/src/glx/create_context.c +++ b/src/glx/create_context.c @@ -98,10 +98,11 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, attrib_list = malloc(sizeof(int) * num_attribs * 2); uint8_t clear_ctx_reset_isolation_bit = false; +#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) dri2GalliumConfigQueryb(psc->frontend_screen, "glx_clear_context_reset_isolation_bit", &clear_ctx_reset_isolation_bit); - +#endif for (unsigned i = 0; i < num_attribs; i++) { attrib_list[i * 2] = orig_attrib_list[i * 2]; if (clear_ctx_reset_isolation_bit &&