leeexin/Velix-MPV-Core
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: move initial color management setup earlier in the init

Browse Source 
When this was originally implemented, there was a dependency on waiting
for certain events from the compositor so it was placed after the
original roundtrip. Since b3abe3975b
removed the need for most of these conditions, we can more logically
place the creation of the color_surface and color_surface_feedback
earlier in the process and leave the wl_display_roundtrip as the true
final call for the wayland init process.
This commit is contained in:
Dudemanguy committed 2025-11-17 01:40:28 +00:00
1 parent 9379c0706d
commit 0a32f988ba
1 file changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files
video/out/wayland_common.c
+13 -13
View File
@@ -3066,6 +3066,9 @@ static int get_mods(struct vo_wayland_seat *s)
static void get_compositor_preferred_description(struct vo_wayland_state *wl)
{
#if HAVE_WAYLAND_PROTOCOLS_1_41
if (!wl->color_surface_feedback)
return;
struct vo_wayland_preferred_description_info *wd = talloc_zero(NULL, struct vo_wayland_preferred_description_info);
wd->wl = wl;
@@ -3439,7 +3442,7 @@ static void seat_create_text_input(struct vo_wayland_seat *seat)
static void set_color_management(struct vo_wayland_state *wl)
{
#if HAVE_WAYLAND_PROTOCOLS_1_41
if (!wl->color_surface)
if (!wl->color_surface && !wl->supports_parametric)
return;
struct pl_color_space color = wl->target_params.color;
@@ -4272,12 +4275,20 @@ bool vo_wayland_init(struct vo *vo)
}
#if HAVE_WAYLAND_PROTOCOLS_1_41
if (!wl->color_manager) {
if (wl->color_manager) {
wl->color_surface_feedback = wp_color_manager_v1_get_surface_feedback(wl->color_manager, wl->callback_surface);
wp_color_management_surface_feedback_v1_add_listener(wl->color_surface_feedback, &surface_feedback_listener, wl);
// Only bind color surface to vo_dmabuf_wayland for now to avoid conflicting with graphics drivers
if (!strcmp(wl->vo->driver->name, "dmabuf-wayland"))
wl->color_surface = wp_color_manager_v1_get_surface(wl->color_manager, wl->callback_surface);
} else {
MP_VERBOSE(wl, "Compositor doesn't support the %s protocol!\n",
wp_color_manager_v1_interface.name);
}
#endif
get_compositor_preferred_description(wl);
#if HAVE_WAYLAND_PROTOCOLS_1_44
if (!wl->color_representation_manager) {
MP_VERBOSE(wl, "Compositor doesn't support the %s protocol!\n",
@@ -4390,17 +4401,6 @@ bool vo_wayland_init(struct vo *vo)
* before mpv does anything else. */
wl_display_roundtrip(wl->display);
#if HAVE_WAYLAND_PROTOCOLS_1_41
// Only bind color surface to vo_dmabuf_wayland for now to avoid conflicting with graphics drivers
if (wl->color_manager && wl->supports_parametric && !strcmp(wl->vo->driver->name, "dmabuf-wayland"))
wl->color_surface = wp_color_manager_v1_get_surface(wl->color_manager, wl->callback_surface);
if (wl->color_manager) {
wl->color_surface_feedback = wp_color_manager_v1_get_surface_feedback(wl->color_manager, wl->callback_surface);
wp_color_management_surface_feedback_v1_add_listener(wl->color_surface_feedback, &surface_feedback_listener, wl);
}
#endif
get_compositor_preferred_description(wl);
return true;
err: