KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan/wsi/wayland: Add modifiers for RGB formats. 

These formats get overwritten after the FALLTHROUGH, so no modifers got added
to them at all.

Fixes: 151b65b211 ("vulkan/wsi/wayland: generalize modifier handling")

Signed-off-by: Georg Lehmann <dadschoorse@gmail.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14588>
This commit is contained in:
Georg Lehmann 2022-01-18 11:19:34 +01:00 committed by Marge Bot
parent a881b6ac1f
commit 9843fddfff
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vulkan/wsi/wsi_common_wayland.c
View File

@ -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,