Merge branch 'use_default_feedback_if_surface_feedback_is_not_ready' into 'master'

Xwayland: use default feedback if surface feedback is not ready

See merge request xorg/xserver!2083
This commit is contained in:
Luke Liu 2025-12-18 04:07:10 +00:00
commit e9704fbd69

View file

@ -370,10 +370,16 @@ xwl_glamor_get_drawable_modifiers_and_scanout(DrawablePtr drawable,
main_dev = xwl_gbm_get_main_device(xwl_screen); main_dev = xwl_gbm_get_main_device(xwl_screen);
if (!xwl_window->feedback.feedback_done) {
/* Surface feedback is not known yet, use the default feedback instead */
return xwl_dmabuf_get_modifiers_for_device(&xwl_screen->default_feedback, main_dev,
format, num_modifiers, modifiers,
supports_scanout);
}
return xwl_dmabuf_get_modifiers_for_device(&xwl_window->feedback, main_dev, return xwl_dmabuf_get_modifiers_for_device(&xwl_window->feedback, main_dev,
format, num_modifiers, modifiers, format, num_modifiers, modifiers,
supports_scanout); supports_scanout);
} }
Bool Bool