Module: Mesa Branch: main Commit: 7afd7299bf16ce7b475a50648a8c1cd28fde885e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7afd7299bf16ce7b475a50648a8c1cd28fde885e
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Tue Dec 19 14:03:28 2023 +0100 vulkan: drop VK_ENABLE_BETA_EXTENSIONS for video encode layouts Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26756> --- src/vulkan/runtime/vk_image.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c index 48e00dc8163..3b1905d8396 100644 --- a/src/vulkan/runtime/vk_image.c +++ b/src/vulkan/runtime/vk_image.c @@ -636,11 +636,9 @@ vk_image_layout_is_read_only(VkImageLayout layout, case VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR: case VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR: case VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR: -#ifdef VK_ENABLE_BETA_EXTENSIONS case VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR: case VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR: case VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR: -#endif unreachable("Invalid image layout."); } @@ -1020,14 +1018,12 @@ vk_image_layout_to_usage_flags(VkImageLayout layout, 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."); }
