summaryrefslogtreecommitdiffstats
path: root/video/out/vulkan/context_wayland.c
diff options
context:
space:
mode:
Diffstat (limited to 'video/out/vulkan/context_wayland.c')
-rw-r--r--video/out/vulkan/context_wayland.c123
1 files changed, 15 insertions, 108 deletions
diff --git a/video/out/vulkan/context_wayland.c b/video/out/vulkan/context_wayland.c
index 98bc8afcfc..3af644ab8a 100644
--- a/video/out/vulkan/context_wayland.c
+++ b/video/out/vulkan/context_wayland.c
@@ -16,105 +16,20 @@
*/
#include "video/out/gpu/context.h"
+#include "video/out/present_sync.h"
#include "video/out/wayland_common.h"
#include "common.h"
#include "context.h"
#include "utils.h"
-// Generated from presentation-time.xml
-#include "generated/wayland/presentation-time.h"
-
struct priv {
struct mpvk_ctx vk;
};
-static const struct wp_presentation_feedback_listener feedback_listener;
-
-static void feedback_sync_output(void *data, struct wp_presentation_feedback *fback,
- struct wl_output *output)
-{
-}
-
-static void feedback_presented(void *data, struct wp_presentation_feedback *fback,
- uint32_t tv_sec_hi, uint32_t tv_sec_lo,
- uint32_t tv_nsec, uint32_t refresh_nsec,
- uint32_t seq_hi, uint32_t seq_lo,
- uint32_t flags)
+static bool wayland_vk_check_visible(struct ra_ctx *ctx)
{
- struct vo_wayland_state *wl = data;
- vo_wayland_sync_shift(wl);
-
- if (fback)
- wp_presentation_feedback_destroy(fback);
-
- // Very similar to oml_sync_control, in this case we assume that every
- // time the compositor receives feedback, a buffer swap has been already
- // been performed.
- //
- // Notes:
- // - tv_sec_lo + tv_sec_hi is the equivalent of oml's ust
- // - seq_lo + seq_hi is the equivalent of oml's msc
- // - these values are updated everytime the compositor receives feedback.
-
- int index = last_available_sync(wl);
- if (index < 0) {
- queue_new_sync(wl);
- index = 0;
- }
- int64_t sec = (uint64_t) tv_sec_lo + ((uint64_t) tv_sec_hi << 32);
- 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;
-}
-
-static void feedback_discarded(void *data, struct wp_presentation_feedback *fback)
-{
-}
-
-static const struct wp_presentation_feedback_listener feedback_listener = {
- feedback_sync_output,
- feedback_presented,
- feedback_discarded,
-};
-
-static const struct wl_callback_listener frame_listener;
-
-static void frame_callback(void *data, struct wl_callback *callback, uint32_t time)
-{
- struct vo_wayland_state *wl = data;
-
- if (callback)
- wl_callback_destroy(callback);
-
- wl->frame_callback = wl_surface_frame(wl->surface);
- wl_callback_add_listener(wl->frame_callback, &frame_listener, wl);
-
- if (wl->presentation) {
- wl->feedback = wp_presentation_feedback(wl->presentation, wl->surface);
- wp_presentation_feedback_add_listener(wl->feedback, &feedback_listener, wl);
- }
-
- wl->frame_wait = false;
-}
-
-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->hidden || wl->opts->disable_vsync;
-
- if (wl->frame_wait && wl->presentation)
- vo_wayland_sync_clear(wl);
-
- if (render)
- wl->frame_wait = true;
-
- return render;
+ return vo_wayland_check_visible(ctx->vo);
}
static void wayland_vk_swap_buffers(struct ra_ctx *ctx)
@@ -124,18 +39,15 @@ static void wayland_vk_swap_buffers(struct ra_ctx *ctx)
if (!wl->opts->disable_vsync)
vo_wayland_wait_frame(wl);
- if (wl->presentation)
- wayland_sync_swap(wl);
+ if (wl->use_present)
+ present_sync_swap(wl->present);
}
static void wayland_vk_get_vsync(struct ra_ctx *ctx, struct vo_vsync_info *info)
{
struct vo_wayland_state *wl = ctx->vo->wl;
- if (wl->presentation) {
- info->vsync_duration = wl->vsync_duration;
- info->skipped_vsyncs = wl->last_skipped_vsyncs;
- info->last_queue_display_time = wl->last_queue_display_time;
- }
+ if (wl->use_present)
+ present_sync_get_info(wl->present, info);
}
static void wayland_vk_uninit(struct ra_ctx *ctx)
@@ -166,7 +78,7 @@ static bool wayland_vk_init(struct ra_ctx *ctx)
};
struct ra_vk_ctx_params params = {
- .start_frame = wayland_vk_start_frame,
+ .check_visible = wayland_vk_check_visible,
.swap_buffers = wayland_vk_swap_buffers,
.get_vsync = wayland_vk_get_vsync,
};
@@ -189,9 +101,6 @@ static bool wayland_vk_init(struct ra_ctx *ctx)
ra_add_native_resource(ctx->ra, "wl", ctx->vo->wl->display);
- ctx->vo->wl->frame_callback = wl_surface_frame(ctx->vo->wl->surface);
- wl_callback_add_listener(ctx->vo->wl->frame_callback, &frame_listener, ctx->vo->wl);
-
return true;
error:
@@ -205,20 +114,17 @@ static bool resize(struct ra_ctx *ctx)
MP_VERBOSE(wl, "Handling resize on the vk side\n");
- const int32_t width = wl->scaling * mp_rect_w(wl->geometry);
- const int32_t height = wl->scaling * mp_rect_h(wl->geometry);
+ const int32_t width = mp_rect_w(wl->geometry);
+ const int32_t height = mp_rect_h(wl->geometry);
vo_wayland_set_opaque_region(wl, ctx->opts.want_alpha);
- wl_surface_set_buffer_scale(wl->surface, wl->scaling);
+ vo_wayland_handle_scale(wl);
return ra_vk_ctx_resize(ctx, width, height);
}
static bool wayland_vk_reconfig(struct ra_ctx *ctx)
{
- if (!vo_wayland_reconfig(ctx->vo))
- return false;
-
- return true;
+ return vo_wayland_reconfig(ctx->vo);
}
static int wayland_vk_control(struct ra_ctx *ctx, int *events, int request, void *arg)
@@ -236,9 +142,9 @@ static void wayland_vk_wakeup(struct ra_ctx *ctx)
vo_wayland_wakeup(ctx->vo);
}
-static void wayland_vk_wait_events(struct ra_ctx *ctx, int64_t until_time_us)
+static void wayland_vk_wait_events(struct ra_ctx *ctx, int64_t until_time_ns)
{
- vo_wayland_wait_events(ctx->vo, until_time_us);
+ vo_wayland_wait_events(ctx->vo, until_time_ns);
}
static void wayland_vk_update_render_opts(struct ra_ctx *ctx)
@@ -251,6 +157,7 @@ static void wayland_vk_update_render_opts(struct ra_ctx *ctx)
const struct ra_ctx_fns ra_ctx_vulkan_wayland = {
.type = "vulkan",
.name = "waylandvk",
+ .description = "Wayland/Vulkan",
.reconfig = wayland_vk_reconfig,
.control = wayland_vk_control,
.wakeup = wayland_vk_wakeup,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:21:04 +0000