From 09499c42027edb85e1accc44f8cfdd6717c3d1ff Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Tue, 18 Jan 2022 00:40:00 +0100 Subject: [PATCH] vulkan/wsi/wayland: Convert missing vulkan formats to shm formats. Fixes: 6b36f35734a ("vulkan/wsi/wl: add wl_shm support for lavapipe.") Signed-off-by: Georg Lehmann Reviewed-by: Lionel Landwerlin Reviewed-by: Simon Ser Part-of: (cherry picked from commit a881b6ac1ff70c73090ee076c4011ad84493ae14) --- .pick_status.json | 2 +- src/vulkan/wsi/wsi_common_wayland.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 322357200d6..2c4c7908f75 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3109,7 +3109,7 @@ "description": "vulkan/wsi/wayland: Convert missing vulkan formats to shm formats.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6b36f35734a9ffa2c6fde475933eb46d7f4fb6f4" }, diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index eb17270539f..1a3621277b3 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -439,6 +439,12 @@ wl_shm_format_for_vk_format(VkFormat vk_format, bool alpha) case VK_FORMAT_B8G8R8A8_UNORM: case VK_FORMAT_B8G8R8A8_SRGB: return alpha ? WL_SHM_FORMAT_ARGB8888 : WL_SHM_FORMAT_XRGB8888; + case VK_FORMAT_R8G8B8_UNORM: + case VK_FORMAT_R8G8B8_SRGB: + return WL_SHM_FORMAT_XBGR8888; + case VK_FORMAT_B8G8R8_UNORM: + case VK_FORMAT_B8G8R8_SRGB: + return WL_SHM_FORMAT_XRGB8888; default: assert(!"Unsupported Vulkan format");