mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 23:25:31 +00:00
Merge commit '82ff6045fa0aa7ff2f861f20512e30688c7b51c3' into main
This commit is contained in:
commit
3ee89ac02e
|
@ -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,6 +1087,9 @@ 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 library and deinit GBM, but only if this is the last remaining window.*/
|
||||||
|
if (viddata->num_windows < 2) {
|
||||||
|
|
||||||
/* Unload EGL/GL library and free egl_data. */
|
/* Unload EGL/GL library and free egl_data. */
|
||||||
if (_this->egl_data) {
|
if (_this->egl_data) {
|
||||||
SDL_EGL_UnloadLibrary(_this);
|
SDL_EGL_UnloadLibrary(_this);
|
||||||
|
@ -1095,6 +1098,7 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window)
|
||||||
|
|
||||||
/* Free display plane, and destroy GBM device. */
|
/* Free display plane, and destroy GBM device. */
|
||||||
KMSDRM_GBMDeinit(_this, dispdata);
|
KMSDRM_GBMDeinit(_this, dispdata);
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue