diff --git a/.pick_status.json b/.pick_status.json index 2c4c7908f75..d0868f67afe 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3100,7 +3100,7 @@ "description": "vulkan/wsi/wayland: Add modifiers for RGB formats.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "151b65b211907d92f3012997aba12b7dbe004e61" }, diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 1a3621277b3..d6649a2e34f 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -294,6 +294,10 @@ wsi_wl_display_add_drm_format_modifier(struct wsi_wl_display *display, format = wsi_wl_display_add_vk_format(display, formats, VK_FORMAT_R8G8B8_UNORM, true, true); + if (format) + wsi_wl_format_add_modifier(format, modifier); + if (srgb_format) + wsi_wl_format_add_modifier(srgb_format, modifier); FALLTHROUGH; case DRM_FORMAT_ABGR8888: srgb_format = wsi_wl_display_add_vk_format(display, formats, @@ -310,6 +314,11 @@ wsi_wl_display_add_drm_format_modifier(struct wsi_wl_display *display, format = wsi_wl_display_add_vk_format(display, formats, VK_FORMAT_B8G8R8_UNORM, true, true); + if (format) + wsi_wl_format_add_modifier(format, modifier); + if (srgb_format) + wsi_wl_format_add_modifier(srgb_format, modifier); + FALLTHROUGH; case DRM_FORMAT_ARGB8888: srgb_format = wsi_wl_display_add_vk_format(display, formats,