TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-20 15:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't store wl_output pointers in mode driver data

Browse Source 
They aren't used for anything, and cause problems if the video core tries to free them.

Manual backport of f9ba0e1

(cherry picked from commit 699cec1a8d)
This commit is contained in:
Frank Praznik
2024-02-14 10:51:09 -05:00
parent beac43f41f
commit 7de4f16710
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/wayland/SDL_waylandvideo.c
View File

@@ -478,17 +478,8 @@ static void display_handle_geometry(void *data,
{
SDL_WaylandOutputData *driverdata = data;
SDL_VideoDisplay *display;
int i;
if (driverdata->wl_output_done_count) {
/* Clear the wl_output ref so Reset doesn't free it */
display = SDL_GetDisplay(driverdata->index);
for (i = 0; i < display->num_display_modes; i += 1) {
display->display_modes[i].driverdata = NULL;
}
/* Okay, now it's safe to reset */
SDL_ResetDisplayModes(driverdata->index);
/* The display has officially started over. */
@@ -600,7 +591,6 @@ static void display_handle_done(void *data,
native_mode.h = driverdata->native_height;
}
native_mode.refresh_rate = (int)SDL_round(driverdata->refresh / 1000.0); /* mHz to Hz */
native_mode.driverdata = driverdata->output;
/* The scaled desktop mode */
SDL_zero(desktop_mode);
@@ -622,7 +612,6 @@ static void display_handle_done(void *data,
desktop_mode.h = driverdata->width;
}
desktop_mode.refresh_rate = (int)SDL_round(driverdata->refresh / 1000.0); /* mHz to Hz */
desktop_mode.driverdata = driverdata->output;
/*
* The native display mode is only exposed separately from the desktop size if the
@@ -1014,7 +1003,7 @@ static int Wayland_GetDisplayDPI(_THIS, SDL_VideoDisplay *sdl_display, float *dd
static void Wayland_VideoCleanup(_THIS)
{
SDL_VideoData *data = _this->driverdata;
int i, j;
int i;
Wayland_QuitWin(data);
Wayland_FiniMouse(data);
@@ -1030,10 +1019,6 @@ static void Wayland_VideoCleanup(_THIS)
SDL_free(display->driverdata);
display->driverdata = NULL;
for (j = display->num_display_modes; j--;) {
display->display_modes[j].driverdata = NULL;
}
display->desktop_mode.driverdata = NULL;
SDL_DelVideoDisplay(i);
}
data->output_list = NULL;