From 0e886a93ce73a1bf84d79d2b33f5a0f7e38722ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Tue, 23 May 2023 16:25:33 +0200 Subject: [PATCH] vulkan: complete the usage flags for video layouts Otherwise Vulkan decoding with FFmpeg crashes on anv. Reviewed-by: Dave Airlie Cc: mesa-stable Part-of: --- src/vulkan/runtime/vk_image.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c index c8e1f9ffcd3..48b7a0e0da4 100644 --- a/src/vulkan/runtime/vk_image.c +++ b/src/vulkan/runtime/vk_image.c @@ -962,15 +962,21 @@ vk_image_layout_to_usage_flags(VkImageLayout layout, VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT; } - case VK_IMAGE_LAYOUT_MAX_ENUM: case VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR: + return VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR; case VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR: + return VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR; case VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR: + return VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR; #ifdef VK_ENABLE_BETA_EXTENSIONS case VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR: + return VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR; case VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR: + return VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR; case VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR: + return VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR; #endif + case VK_IMAGE_LAYOUT_MAX_ENUM: unreachable("Invalid image layout."); }