glx: Add back in applegl_create_display() so the OpenGL.framework, on MacOS, pointer get setup.

Fixes: 4e8740370a ("glx: rework __glXInitialize")

Tested-by: Yurii Kolesnykov <root@yurikoles.com>
(cherry picked from commit 20b806284a)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33113>
This commit is contained in:
duncan.hopkins
2024-12-16 11:49:33 +00:00
committed by Dylan Baker
parent ec927daa99
commit 9401fd9e7e
2 changed files with 8 additions and 1 deletions

View File

@@ -664,7 +664,7 @@
"description": "glx: Add back in `applegl_create_display()` so the OpenGL.framework, on MacOS, pointer get setup.",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "4e8740370adaad5f8992c13262e1dfc66274d838",
"notes": null

View File

@@ -1078,6 +1078,13 @@ __glXInitialize(Display * dpy)
glx_driver |= GLX_DRIVER_SW;
#endif
#if defined(GLX_USE_APPLEGL) && !defined(GLX_USE_APPLE)
if (!applegl_create_display(dpyPriv)) {
free(dpyPriv);
return NULL;
}
#endif
if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, glx_driver, !env)) {
Bool fail = True;
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))