encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '82ff6045fa0aa7ff2f861f20512e30688c7b51c3' into main

This commit is contained in:
Sam Lantinga 2021-03-22 19:16:25 -07:00
parent 4b1dfb14e1 82ff6045fa
commit 3ee89ac02e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -1079,7 +1079,7 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
return; return;
} }
if ( !is_vulkan && viddata->gbm_init ) { if ( !is_vulkan && viddata->gbm_init) {
/* Destroy the window display's cursor GBM BO. */ /* Destroy the window display's cursor GBM BO. */
KMSDRM_DestroyCursorBO(_this, SDL_GetDisplayForWindow(window)); KMSDRM_DestroyCursorBO(_this, SDL_GetDisplayForWindow(window));
@ -1087,14 +1087,18 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
/* Destroy GBM surface and buffers. */ /* Destroy GBM surface and buffers. */
KMSDRM_DestroySurfaces(_this, window); KMSDRM_DestroySurfaces(_this, window);
/* Unload EGL/GL library and free egl_data. */ /* Unload library and deinit GBM, but only if this is the last remaining window.*/
if (_this->egl_data) { if (viddata->num_windows < 2) {
SDL_EGL_UnloadLibrary(_this);
_this->gl_config.driver_loaded = 0;
}
/* Free display plane, and destroy GBM device. */ /* Unload EGL/GL library and free egl_data. */
KMSDRM_GBMDeinit(_this, dispdata); if (_this->egl_data) {
SDL_EGL_UnloadLibrary(_this);
_this->gl_config.driver_loaded = 0;
}
/* Free display plane, and destroy GBM device. */
KMSDRM_GBMDeinit(_this, dispdata);
}
} else { } else {