wayland: Don't delay pending surface resize handling on Vulkan.
OpenGL apparently needs to not do any drawing between wl_egl_window_resize
and eglSwapBuffers, but Vulkan apps don't use SDL to present, so they
never call into an equivalent of SDL_GL_SwapWindow where our Wayland code
was handling pending resize work.
Fixes Bugzilla #4722.
--HG--
extra : rebase_source : 123396f1b250a880cf9f47a7fc8895538ea7272d
diff --git a/src/video/wayland/SDL_waylandopengles.c b/src/video/wayland/SDL_waylandopengles.c
index 89ad582..b5771e0 100644
--- a/src/video/wayland/SDL_waylandopengles.c
+++ b/src/video/wayland/SDL_waylandopengles.c
@@ -63,41 +63,13 @@
Wayland_GLES_SwapWindow(_THIS, SDL_Window *window)
{
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
- struct wl_region *region;
if (SDL_EGL_SwapBuffers(_this, data->egl_surface) < 0) {
return -1;
}
// Wayland-EGL forbids drawing calls in-between SwapBuffers and wl_egl_window_resize
- if (data->resize.pending) {
- if (data->scale_factor != data->resize.scale_factor) {
- window->w = 0;
- window->h = 0;
- }
- SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, data->resize.width, data->resize.height);
- window->w = data->resize.width;
- window->h = data->resize.height;
- data->scale_factor = data->resize.scale_factor;
- wl_surface_set_buffer_scale(data->surface, data->scale_factor);
- WAYLAND_wl_egl_window_resize(data->egl_window, window->w * data->scale_factor, window->h * data->scale_factor, 0, 0);
-
- if (data->resize.configure) {
- if (data->waylandData->shell.xdg) {
- xdg_surface_ack_configure(data->shell_surface.xdg.surface, data->resize.serial);
- } else if (data->waylandData->shell.zxdg) {
- zxdg_surface_v6_ack_configure(data->shell_surface.zxdg.surface, data->resize.serial);
- }
- data->resize.configure = SDL_FALSE;
- }
-
- region = wl_compositor_create_region(data->waylandData->compositor);
- wl_region_add(region, 0, 0, window->w, window->h);
- wl_surface_set_opaque_region(data->surface, region);
- wl_region_destroy(region);
-
- data->resize.pending = SDL_FALSE;
- }
+ Wayland_HandlePendingResize(window);
WAYLAND_wl_display_flush( data->waylandData->display );
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 05d4894..395e941 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -87,6 +87,10 @@
wind->resize.width = width;
wind->resize.height = height;
wind->resize.pending = SDL_TRUE;
+
+ if (!(window->flags & SDL_WINDOW_OPENGL)) {
+ Wayland_HandlePendingResize(window); /* OpenGL windows handle this in SwapWindow */
+ }
}
static void
@@ -134,6 +138,9 @@
wind->resize.pending = SDL_TRUE;
wind->resize.configure = SDL_TRUE;
wind->resize.serial = serial;
+ if (!(window->flags & SDL_WINDOW_OPENGL)) {
+ Wayland_HandlePendingResize(window); /* OpenGL windows handle this in SwapWindow */
+ }
}
}
@@ -241,6 +248,9 @@
wind->resize.pending = SDL_TRUE;
wind->resize.configure = SDL_TRUE;
wind->resize.serial = serial;
+ if (!(window->flags & SDL_WINDOW_OPENGL)) {
+ Wayland_HandlePendingResize(window); /* OpenGL windows handle this in SwapWindow */
+ }
}
}
@@ -376,6 +386,9 @@
window->resize.height = window->sdlwindow->h;
window->resize.scale_factor = new_factor;
window->resize.pending = SDL_TRUE;
+ if (!(window->sdlwindow->flags & SDL_WINDOW_OPENGL)) {
+ Wayland_HandlePendingResize(window->sdlwindow); /* OpenGL windows handle this in SwapWindow */
+ }
}
}
@@ -782,6 +795,45 @@
return 0;
}
+
+void
+Wayland_HandlePendingResize(SDL_Window *window)
+{
+ SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+ if (data->resize.pending) {
+ struct wl_region *region;
+ if (data->scale_factor != data->resize.scale_factor) {
+ window->w = 0;
+ window->h = 0;
+ }
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, data->resize.width, data->resize.height);
+ window->w = data->resize.width;
+ window->h = data->resize.height;
+ data->scale_factor = data->resize.scale_factor;
+ wl_surface_set_buffer_scale(data->surface, data->scale_factor);
+ if (data->egl_window) {
+ WAYLAND_wl_egl_window_resize(data->egl_window, window->w * data->scale_factor, window->h * data->scale_factor, 0, 0);
+ }
+
+ if (data->resize.configure) {
+ if (data->waylandData->shell.xdg) {
+ xdg_surface_ack_configure(data->shell_surface.xdg.surface, data->resize.serial);
+ } else if (data->waylandData->shell.zxdg) {
+ zxdg_surface_v6_ack_configure(data->shell_surface.zxdg.surface, data->resize.serial);
+ }
+ data->resize.configure = SDL_FALSE;
+ }
+
+ region = wl_compositor_create_region(data->waylandData->compositor);
+ wl_region_add(region, 0, 0, window->w, window->h);
+ wl_surface_set_opaque_region(data->surface, region);
+ wl_region_destroy(region);
+
+ data->resize.pending = SDL_FALSE;
+ }
+}
+
void Wayland_SetWindowSize(_THIS, SDL_Window * window)
{
SDL_VideoData *data = _this->driverdata;
diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h
index 33cabc7..322ce63 100644
--- a/src/video/wayland/SDL_waylandwindow.h
+++ b/src/video/wayland/SDL_waylandwindow.h
@@ -99,6 +99,8 @@
Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
extern int Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
+extern void Wayland_HandlePendingResize(SDL_Window *window);
+
#endif /* SDL_waylandwindow_h_ */
/* vi: set ts=4 sw=4 expandtab: */
