RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland: be less stupid with color surface creation 

Basically we only want to create the color surface if the compositor
supports parametric image descriptions and if the vo is dmabuf-wayland.
Instead of doing the weird dance of creating it in one spot and
destroying it later, just only make the wayland object when we actually
want it. It makes the logging less confusing as well.
This commit is contained in:
Dudemanguy 2024-10-18 15:21:11 -05:00
parent 6b695ac6e4
commit c0fb6d0d62
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
video/out/wayland_common.c
View File

@ -3114,10 +3114,7 @@ bool vo_wayland_init(struct vo *vo)
wl->video_subsurface = wl_subcompositor_get_subsurface(wl->subcompositor, wl->video_surface, wl->surface); wl->video_subsurface = wl_subcompositor_get_subsurface(wl->subcompositor, wl->video_surface, wl->surface);
} }
// Only bind to vo_dmabuf_wayland for now to avoid conflicting with VK_hdr_layer if (!wl->color_manager) {
if (wl->color_manager && !strcmp(wl->vo->driver->name, "dmabuf-wayland")) {
wl->color_surface = xx_color_manager_v4_get_surface(wl->color_manager, wl->callback_surface);
} else {
MP_VERBOSE(wl, "Compositor doesn't support the %s protocol!\n", MP_VERBOSE(wl, "Compositor doesn't support the %s protocol!\n",
xx_color_manager_v4_interface.name); xx_color_manager_v4_interface.name);
} }
@ -3205,13 +3202,11 @@ bool vo_wayland_init(struct vo *vo)
* before mpv does anything else. */ * before mpv does anything else. */
wl_display_roundtrip(wl->display); wl_display_roundtrip(wl->display);
// The compositor needs to at least support parametric otherwise // Only bind to vo_dmabuf_wayland for now to avoid conflicting with VK_hdr_layer
// the protocol is useless for us. if (wl->color_manager && wl->supports_parametric && !strcmp(wl->vo->driver->name, "dmabuf-wayland")) {
// TODO: Use the icc stuff. wl->color_surface = xx_color_manager_v4_get_surface(wl->color_manager, wl->callback_surface);
if (wl->color_manager && !wl->supports_parametric) { } else {
MP_VERBOSE(wl, "Compositor does not support parametic image descriptions!\n"); MP_VERBOSE(wl, "Compositor does not support parametic image descriptions!\n");
xx_color_management_surface_v4_destroy(wl->color_surface);
wl->color_surface = NULL;
} }
return true; return true;