diff --git a/.pick_status.json b/.pick_status.json index 42af69d6c93..2e6cb2e92f1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 34f9f718327..ed4801ed42f 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -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))