From 1b4ae3d7af8af5373a797a56b71823f32badb178 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 15 Aug 2024 14:21:53 +1000
Subject: [PATCH] vulkan/video: handle KHR_video_maintenance1 lack of profile
 list.

VK_KHR_video_maintenance1 allows no profile in which cases drivers
should just be pessimisitic.

Reviewed-by: Hyunjun Ko <zzoon@igalia.com>
Reviewed-by: Lynne <dev@lynne.ee>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30671>
---
 src/vulkan/runtime/vk_video.c | 42 ++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/vulkan/runtime/vk_video.c b/src/vulkan/runtime/vk_video.c
index e4fa3d66c32..fc9605c5149 100644
--- a/src/vulkan/runtime/vk_video.c
+++ b/src/vulkan/runtime/vk_video.c
@@ -1359,22 +1359,32 @@ vk_video_get_profile_alignments(const VkVideoProfileListInfoKHR *profile_list,
                                 uint32_t *width_align_out, uint32_t *height_align_out)
 {
    uint32_t width_align = 1, height_align = 1;
-   for (unsigned i = 0; i < profile_list->profileCount; i++) {
-      if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR ||
-          profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR
-         ) {
-         width_align = MAX2(width_align, VK_VIDEO_H264_MACROBLOCK_WIDTH);
-         height_align = MAX2(height_align, VK_VIDEO_H264_MACROBLOCK_HEIGHT);
-      }
-      if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR ||
-          profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR
-         ) {
-         width_align = MAX2(width_align, VK_VIDEO_H265_CTU_MAX_WIDTH);
-         height_align = MAX2(height_align, VK_VIDEO_H265_CTU_MAX_HEIGHT);
-      }
-      if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR) {
-         width_align = MAX2(width_align, VK_VIDEO_AV1_BLOCK_WIDTH);
-         height_align = MAX2(height_align, VK_VIDEO_AV1_BLOCK_HEIGHT);
+
+   if (!profile_list) {
+      width_align = MAX2(width_align, VK_VIDEO_H264_MACROBLOCK_WIDTH);
+      height_align = MAX2(height_align, VK_VIDEO_H264_MACROBLOCK_HEIGHT);
+      width_align = MAX2(width_align, VK_VIDEO_H265_CTU_MAX_WIDTH);
+      height_align = MAX2(height_align, VK_VIDEO_H265_CTU_MAX_HEIGHT);
+      width_align = MAX2(width_align, VK_VIDEO_AV1_BLOCK_WIDTH);
+      height_align = MAX2(height_align, VK_VIDEO_AV1_BLOCK_HEIGHT);
+   } else {
+      for (unsigned i = 0; i < profile_list->profileCount; i++) {
+         if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR ||
+             profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR
+            ) {
+            width_align = MAX2(width_align, VK_VIDEO_H264_MACROBLOCK_WIDTH);
+            height_align = MAX2(height_align, VK_VIDEO_H264_MACROBLOCK_HEIGHT);
+         }
+         if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR ||
+             profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR
+            ) {
+            width_align = MAX2(width_align, VK_VIDEO_H265_CTU_MAX_WIDTH);
+            height_align = MAX2(height_align, VK_VIDEO_H265_CTU_MAX_HEIGHT);
+         }
+         if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR) {
+            width_align = MAX2(width_align, VK_VIDEO_AV1_BLOCK_WIDTH);
+            height_align = MAX2(height_align, VK_VIDEO_AV1_BLOCK_HEIGHT);
+         }
       }
    }
    *width_align_out = width_align;