eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.
This commit is contained in:
Frank Praznik 2024-02-14 10:27:42 -05:00
parent 5e1d9d19a4
commit f9ba0e1dbd
1 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/video/wayland/SDL_waylandvideo.c
View file

@ -647,7 +647,6 @@ static void AddEmulatedModes(SDL_DisplayData *dispdata, int native_width, int na
SDL_zero(mode); SDL_zero(mode);
mode.format = dpy->desktop_mode.format; mode.format = dpy->desktop_mode.format;
mode.refresh_rate = dpy->desktop_mode.refresh_rate; mode.refresh_rate = dpy->desktop_mode.refresh_rate;
mode.driverdata = dpy->desktop_mode.driverdata;
if (rot_90) { if (rot_90) {
mode.w = mode_list[i].h; mode.w = mode_list[i].h;
@ -773,16 +772,8 @@ static void display_handle_done(void *data,
} }
/* If the display was already created, reset and rebuild the mode list. */ /* If the display was already created, reset and rebuild the mode list. */
if (driverdata->display != 0) { dpy = SDL_GetVideoDisplay(driverdata->display);
int i; if (dpy) {
dpy = SDL_GetVideoDisplay(driverdata->display);
/* Clear the wl_output ref so Reset doesn't free it */
for (i = 0; i < dpy->num_fullscreen_modes; ++i) {
dpy->fullscreen_modes[i].driverdata = NULL;
}
/* Okay, now it's safe to reset */
SDL_ResetFullscreenDisplayModes(dpy); SDL_ResetFullscreenDisplayModes(dpy);
} }
@ -799,7 +790,6 @@ static void display_handle_done(void *data,
native_mode.h = driverdata->pixel_height; native_mode.h = driverdata->pixel_height;
} }
native_mode.refresh_rate = ((100 * driverdata->refresh) / 1000) / 100.0f; /* mHz to Hz */ native_mode.refresh_rate = ((100 * driverdata->refresh) / 1000) / 100.0f; /* mHz to Hz */
native_mode.driverdata = driverdata->output;
if (driverdata->has_logical_size) { /* If xdg-output is present... */ if (driverdata->has_logical_size) { /* If xdg-output is present... */
if (native_mode.w != driverdata->screen_width || native_mode.h != driverdata->screen_height) { if (native_mode.w != driverdata->screen_width || native_mode.h != driverdata->screen_height) {
@ -835,7 +825,6 @@ static void display_handle_done(void *data,
desktop_mode.h = driverdata->screen_height; desktop_mode.h = driverdata->screen_height;
desktop_mode.pixel_density = driverdata->scale_factor; desktop_mode.pixel_density = driverdata->scale_factor;
desktop_mode.refresh_rate = ((100 * driverdata->refresh) / 1000) / 100.0f; /* mHz to Hz */ desktop_mode.refresh_rate = ((100 * driverdata->refresh) / 1000) / 100.0f; /* mHz to Hz */
desktop_mode.driverdata = driverdata->output;
if (driverdata->display > 0) { if (driverdata->display > 0) {
dpy = SDL_GetVideoDisplay(driverdata->display); dpy = SDL_GetVideoDisplay(driverdata->display);
@ -957,7 +946,6 @@ static void Wayland_free_display(SDL_VideoDisplay *display)
{ {
if (display) { if (display) {
SDL_DisplayData *display_data = display->driverdata; SDL_DisplayData *display_data = display->driverdata;
int i;
SDL_free(display_data->wl_output_name); SDL_free(display_data->wl_output_name);
@ -974,11 +962,6 @@ static void Wayland_free_display(SDL_VideoDisplay *display)
/* Unlink this display. */ /* Unlink this display. */
WAYLAND_wl_list_remove(&display_data->link); WAYLAND_wl_list_remove(&display_data->link);
/* Null the driverdata member of the mode structs, or they will be wrongly freed. */
for (i = display->num_fullscreen_modes; i--;) {
display->fullscreen_modes[i].driverdata = NULL;
}
display->desktop_mode.driverdata = NULL;
SDL_DelVideoDisplay(display->id, SDL_FALSE); SDL_DelVideoDisplay(display->id, SDL_FALSE);
} }
} }