1 files changed, 17 insertions, 6 deletions

diff --git a/video/out/vulkan/context_wayland.c b/video/out/vulkan/context_wayland.c
index ab295152dd..481c1005e1 100644
--- a/video/out/vulkan/context_wayland.c
+++ b/video/out/vulkan/context_wayland.c
@@ -63,7 +63,6 @@ static void feedback_presented(void *data, struct wp_presentation_feedback *fbac
         index = 0;
     }
     int64_t sec = (uint64_t) tv_sec_lo + ((uint64_t) tv_sec_hi << 32);
-    wl->sync[index].sbc = wl->user_sbc;
     wl->sync[index].ust = sec * 1000000LL + (uint64_t) tv_nsec / 1000;
     wl->sync[index].msc = (uint64_t) seq_lo + ((uint64_t) seq_hi << 32);
     wl->sync[index].filled = true;
@@ -103,6 +102,21 @@ static const struct wl_callback_listener frame_listener = {
     frame_callback,
 };
 
+static bool wayland_vk_start_frame(struct ra_ctx *ctx)
+{
+    struct vo_wayland_state *wl = ctx->vo->wl;
+
+    bool render = !wl->frame_wait || wl->opts->disable_vsync;
+
+    if (wl->frame_wait && wl->presentation)
+        vo_wayland_sync_clear(wl);
+
+    if (render)
+        wl->frame_wait = true;
+
+    return render;
+}
+
 static void wayland_vk_swap_buffers(struct ra_ctx *ctx)
 {
     struct vo_wayland_state *wl = ctx->vo->wl;
@@ -110,12 +124,8 @@ static void wayland_vk_swap_buffers(struct ra_ctx *ctx)
     if (!wl->opts->disable_vsync)
         vo_wayland_wait_frame(wl);
 
-    if (wl->presentation) {
-        wl->user_sbc += 1;
+    if (wl->presentation)
         wayland_sync_swap(wl);
-    }
-
-    wl->frame_wait = true;
 }
 
 static void wayland_vk_get_vsync(struct ra_ctx *ctx, struct vo_vsync_info *info)
@@ -156,6 +166,7 @@ static bool wayland_vk_init(struct ra_ctx *ctx)
     };
 
     struct ra_vk_ctx_params params = {
+        .start_frame = wayland_vk_start_frame,
         .swap_buffers = wayland_vk_swap_buffers,
         .get_vsync = wayland_vk_get_vsync,
     };