Merge branch 'wip/otte/for-main' into 'main'

wayland: Don't call gdk_display_sync()

Closes #7022 and #7025

See merge request GNOME/gtk!7726
This commit is contained in:
Benjamin Otte
2024-09-21 17:01:19 +00:00

View File

@@ -40,13 +40,6 @@ gdk_wayland_vulkan_context_create_surface (GdkVulkanContext *context,
GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context));
GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
/* This is necessary so that Vulkan sees the Surface.
* Usually, vkCreateXlibSurfaceKHR() will not cause a problem to happen as
* it just creates resources, but further calls with the resulting surface
* do cause issues.
*/
gdk_display_sync (display);
return GDK_VK_CHECK (vkCreateWaylandSurfaceKHR, gdk_vulkan_context_get_instance (context),
&(VkWaylandSurfaceCreateInfoKHR) {
VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR,