From 53d40878c85b6f2fee506d682083b06a4ba037af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 28 Apr 2022 21:17:39 +0200 Subject: [PATCH] X11: Fix OSMesa library not being unloaded (cherry picked from commit a8d8b760fb6bffb9c7f65297a0bc3d6bf6b54262) --- README.md | 1 + src/x11_init.c | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index dc051fd2..0e18c811 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ information on what to include when reporting a bug. - [Win32] Bugfix: The OSMesa library was not unloaded on termination - [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791) - [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination + - [X11] Bugfix: The OSMesa libray was not unloaded on termination - [Wayland] Added support for file path drop events (#2040) - [Wayland] Bugfix: `glfwSetClipboardString` would fail if set to result of `glfwGetClipboardString` diff --git a/src/x11_init.c b/src/x11_init.c index 4fd9587e..8dd433f1 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -1235,6 +1235,7 @@ void _glfwPlatformTerminate(void) _glfw.x11.xi.handle = NULL; } + _glfwTerminateOSMesa(); // NOTE: These need to be unloaded after XCloseDisplay, as they register // cleanup callbacks that get called by that function _glfwTerminateEGL();