Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

wayland: Ignore configure events during splash (#16398)

Browse source 
These were causing the gl/vk surfaces to be created with the wrong size.
This commit is contained in:
Colin Kinloch 2024-04-03 01:55:02 +01:00 • committed by GitHub
parent 9b969910c4
commit cdd6aed8ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gfx/common/wayland_common.c
View file

@ -789,6 +789,9 @@ bool gfx_ctx_wl_init_common(
} }
} }
// Ignore configure events until splash screen has been replaced
wl->ignore_configuration = true;
wl->input.fd = wl_display_get_fd(wl->input.dpy); wl->input.fd = wl_display_get_fd(wl->input.dpy);
wl->input.keyboard_focus = true; wl->input.keyboard_focus = true;

5
gfx/drivers_context/wayland_ctx.c
View file

@ -63,6 +63,8 @@ static void xdg_toplevel_handle_configure(void *data,
int32_t width, int32_t height, struct wl_array *states) int32_t width, int32_t height, struct wl_array *states)
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (wl->ignore_configuration)
return;
xdg_toplevel_handle_configure_common(wl, toplevel, width, height, states); xdg_toplevel_handle_configure_common(wl, toplevel, width, height, states);
#ifdef HAVE_EGL #ifdef HAVE_EGL
if (wl->win) if (wl->win)
@ -113,6 +115,7 @@ static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height)
if (!wl->fractional_scale) if (!wl->fractional_scale)
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
wl->ignore_configuration = false;
#ifdef HAVE_EGL #ifdef HAVE_EGL
wl_egl_window_resize(wl->win, width, height, 0, 0); wl_egl_window_resize(wl->win, width, height, 0, 0);
#endif #endif
@ -126,6 +129,8 @@ libdecor_frame_handle_configure(struct libdecor_frame *frame,
struct libdecor_configuration *configuration, void *data) struct libdecor_configuration *configuration, void *data)
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (wl->ignore_configuration)
return;
libdecor_frame_handle_configure_common(frame, configuration, wl); libdecor_frame_handle_configure_common(frame, configuration, wl);
#ifdef HAVE_EGL #ifdef HAVE_EGL

5
gfx/drivers_context/wayland_vk_ctx.c
View file

@ -55,6 +55,8 @@ static void xdg_toplevel_handle_configure(void *data,
int32_t width, int32_t height, struct wl_array *states) int32_t width, int32_t height, struct wl_array *states)
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (wl->ignore_configuration)
return;
xdg_toplevel_handle_configure_common(wl, toplevel, width, height, states); xdg_toplevel_handle_configure_common(wl, toplevel, width, height, states);
wl->configured = false; wl->configured = false;
} }
@ -92,6 +94,7 @@ static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height)
if (vulkan_create_swapchain(&wl->vk, width, height, wl->swap_interval)) if (vulkan_create_swapchain(&wl->vk, width, height, wl->swap_interval))
{ {
wl->ignore_configuration = false;
wl->vk.context.flags |= VK_CTX_FLAG_INVALID_SWAPCHAIN; wl->vk.context.flags |= VK_CTX_FLAG_INVALID_SWAPCHAIN;
if (wl->vk.flags & VK_DATA_FLAG_CREATED_NEW_SWAPCHAIN) if (wl->vk.flags & VK_DATA_FLAG_CREATED_NEW_SWAPCHAIN)
vulkan_acquire_next_image(&wl->vk); vulkan_acquire_next_image(&wl->vk);
@ -111,6 +114,8 @@ libdecor_frame_handle_configure(struct libdecor_frame *frame,
struct libdecor_configuration *configuration, void *data) struct libdecor_configuration *configuration, void *data)
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (wl->ignore_configuration)
return;
libdecor_frame_handle_configure_common(frame, configuration, wl); libdecor_frame_handle_configure_common(frame, configuration, wl);
wl->configured = false; wl->configured = false;

1
input/common/wayland_common.h
View file

@ -219,6 +219,7 @@ typedef struct gfx_ctx_wayland_data
bool maximized; bool maximized;
bool resize; bool resize;
bool configured; bool configured;
bool ignore_configuration;
bool activated; bool activated;
bool reported_display_size; bool reported_display_size;
bool swap_complete; bool swap_complete;