diff --git a/common/video/wayland_surface.cpp b/common/video/wayland_surface.cpp
index 443f6bb2..3628747f 100644
--- a/common/video/wayland_surface.cpp
+++ b/common/video/wayland_surface.cpp
@@ -139,6 +139,8 @@ bool WaylandSurface::attach(wl_display *display, wl_surface *surface, Metrics m)
         zwp_idle_inhibit_manager_v1_create_inhibitor(idle_inhibit_manager, child);
     }
 
+    wl_display_roundtrip(display);
+
     resize(m);
 
     return true;
diff --git a/external/SPIRV-Cross b/external/SPIRV-Cross
index 197a273f..4e2fdb25 160000
--- a/external/SPIRV-Cross
+++ b/external/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 197a273fd494321157f40a962c51b5fa8c9c3581
+Subproject commit 4e2fdb25671c742a9fbe93a6034eb1542244c7e1