glx: Fix memory leak with software dri
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

dri_screen_init() now calls glx_screen_init() directly. Calling
twice overwrites the config.

Fixes: 7930fe5f01 ("glx: unify dri screen init")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35525>
This commit is contained in:
Doug Nazar 2025-06-13 19:22:31 -04:00 committed by Marge Bot
parent 3387e9e8e9
commit c3980bb4ec

View file

@ -656,17 +656,11 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
if (psc == NULL)
return NULL;
psc->kopper = !strcmp(driver, "zink");
if (!glx_screen_init(&psc->base, screen, priv)) {
free(psc);
return NULL;
}
psc->base.driverName = strdup(driver);
if (glx_driver)
loader_extensions_local = kopper_extensions_noshm;
else if (!check_xshm(psc->base.dpy))
else if (!check_xshm(priv->dpy))
loader_extensions_local = loader_extensions_noshm;
else
loader_extensions_local = loader_extensions_shm;