mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
This builds off of present_sync which was introduced in a previous commit to support xorg's present extension in all of the X11 backends (sans vdpau) in mpv. It turns out there is an Xpresent library that integrates the xorg present extention with Xlib (which barely anyone seems to use), so this can be added without too much trouble. The workflow is to first setup the event by telling Xorg we would like to receive PresentCompleteNotify (there are others in the extension but this is the only one we really care about). After that, just call XPresentNotifyMSC after every buffer swap with a target_msc of 0. Xorg then returns the last presentation through its usual event loop and we go ahead and use that information to update mpv's values for vsync timing purposes. One theoretical weakness of this approach is that the present event is put on the same queue as the rest of the XEvents. It would be nicer for it be placed somewhere else so we could just wait on that queue without having to deal with other possible events in there. In theory, xcb could do that with special events, but it doesn't really matter in practice. Unsurprisingly, this doesn't work on NVIDIA. Well NVIDIA does actually receive presentation events, but for whatever the calculations used make timings worse which defeats the purpose. This works perfectly fine on Mesa however. Utilizing the previous commit that detects Xrandr providers, we can enable this mechanism for users that have both Mesa and not NVIDIA (to avoid messing up anyone that has a switchable graphics system or such). Patches welcome if anyone figures out how to fix this on NVIDIA. Unlike the EGL/GLX sync extensions, the present extension works with any graphics API (good for vulkan since its timing extension has been in development hell). NVIDIA also happens to have zero support for the EGL/GLX sync extensions, so we can just remove it with no loss. Only Xorg ever used it and other backends already have their own present methods. vo_vdpau VO is a special case that has its own fancying timing code in its flip_page. This presumably works well, and I have no way of testing it so just leave it as it is.
143 lines
3.6 KiB
C
143 lines
3.6 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "video/out/gpu/context.h"
|
|
#include "video/out/present_sync.h"
|
|
#include "video/out/x11_common.h"
|
|
|
|
#include "common.h"
|
|
#include "context.h"
|
|
#include "utils.h"
|
|
|
|
struct priv {
|
|
struct mpvk_ctx vk;
|
|
};
|
|
|
|
static bool xlib_check_visible(struct ra_ctx *ctx)
|
|
{
|
|
return vo_x11_check_visible(ctx->vo);
|
|
}
|
|
|
|
static void xlib_vk_swap_buffers(struct ra_ctx *ctx)
|
|
{
|
|
vo_x11_present(ctx->vo);
|
|
present_sync_swap(ctx->vo->x11->present);
|
|
}
|
|
|
|
static void xlib_vk_get_vsync(struct ra_ctx *ctx, struct vo_vsync_info *info)
|
|
{
|
|
struct vo_x11_state *x11 = ctx->vo->x11;
|
|
present_sync_get_info(x11->present, info);
|
|
}
|
|
|
|
static void xlib_uninit(struct ra_ctx *ctx)
|
|
{
|
|
struct priv *p = ctx->priv;
|
|
|
|
ra_vk_ctx_uninit(ctx);
|
|
mpvk_uninit(&p->vk);
|
|
vo_x11_uninit(ctx->vo);
|
|
}
|
|
|
|
static bool xlib_init(struct ra_ctx *ctx)
|
|
{
|
|
struct priv *p = ctx->priv = talloc_zero(ctx, struct priv);
|
|
struct mpvk_ctx *vk = &p->vk;
|
|
int msgl = ctx->opts.probing ? MSGL_V : MSGL_ERR;
|
|
|
|
if (!mpvk_init(vk, ctx, VK_KHR_XLIB_SURFACE_EXTENSION_NAME))
|
|
goto error;
|
|
|
|
if (!vo_x11_init(ctx->vo))
|
|
goto error;
|
|
|
|
if (!vo_x11_create_vo_window(ctx->vo, NULL, "mpvk"))
|
|
goto error;
|
|
|
|
VkXlibSurfaceCreateInfoKHR xinfo = {
|
|
.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
|
|
.dpy = ctx->vo->x11->display,
|
|
.window = ctx->vo->x11->window,
|
|
};
|
|
|
|
struct ra_vk_ctx_params params = {
|
|
.check_visible = xlib_check_visible,
|
|
.swap_buffers = xlib_vk_swap_buffers,
|
|
.get_vsync = xlib_vk_get_vsync,
|
|
};
|
|
|
|
VkInstance inst = vk->vkinst->instance;
|
|
VkResult res = vkCreateXlibSurfaceKHR(inst, &xinfo, NULL, &vk->surface);
|
|
if (res != VK_SUCCESS) {
|
|
MP_MSG(ctx, msgl, "Failed creating Xlib surface\n");
|
|
goto error;
|
|
}
|
|
|
|
if (!ra_vk_ctx_init(ctx, vk, params, VK_PRESENT_MODE_FIFO_KHR))
|
|
goto error;
|
|
|
|
ra_add_native_resource(ctx->ra, "x11", ctx->vo->x11->display);
|
|
|
|
return true;
|
|
|
|
error:
|
|
xlib_uninit(ctx);
|
|
return false;
|
|
}
|
|
|
|
static bool resize(struct ra_ctx *ctx)
|
|
{
|
|
return ra_vk_ctx_resize(ctx, ctx->vo->dwidth, ctx->vo->dheight);
|
|
}
|
|
|
|
static bool xlib_reconfig(struct ra_ctx *ctx)
|
|
{
|
|
vo_x11_config_vo_window(ctx->vo);
|
|
return resize(ctx);
|
|
}
|
|
|
|
static int xlib_control(struct ra_ctx *ctx, int *events, int request, void *arg)
|
|
{
|
|
int ret = vo_x11_control(ctx->vo, events, request, arg);
|
|
if (*events & VO_EVENT_RESIZE) {
|
|
if (!resize(ctx))
|
|
return VO_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void xlib_wakeup(struct ra_ctx *ctx)
|
|
{
|
|
vo_x11_wakeup(ctx->vo);
|
|
}
|
|
|
|
static void xlib_wait_events(struct ra_ctx *ctx, int64_t until_time_us)
|
|
{
|
|
vo_x11_wait_events(ctx->vo, until_time_us);
|
|
}
|
|
|
|
const struct ra_ctx_fns ra_ctx_vulkan_xlib = {
|
|
.type = "vulkan",
|
|
.name = "x11vk",
|
|
.reconfig = xlib_reconfig,
|
|
.control = xlib_control,
|
|
.wakeup = xlib_wakeup,
|
|
.wait_events = xlib_wait_events,
|
|
.init = xlib_init,
|
|
.uninit = xlib_uninit,
|
|
};
|