Fix VK_API_MAX_FRAMEWORK_VERSION

Change-Id: Ib8f99b9c43797d403eb5f65941f9d7ba66e24cf6

Author: lordalcol

external/vulkancts/framework/vulkan/generated/vulkan/vkBasicTypes.inl

@@ -43,7 +43,7 @@
 #define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_API_VERSION_1_0_0	(static_cast<uint32_t>			(VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)))
 #define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_API_VERSION_1_0_0	(static_cast<uint32_t>			(VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)))
 #define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_1_0_0	(static_cast<uint32_t>			(VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)))
-#define VK_API_MAX_FRAMEWORK_VERSION	VK_API_VERSION_1_0
+#define VK_API_MAX_FRAMEWORK_VERSION	VK_API_VERSION_1_4
 
 // Handles
 VK_DEFINE_HANDLE					(VkInstance,						HANDLE_TYPE_INSTANCE);

external/vulkancts/scripts/gen_framework.py

@@ -1324,10 +1324,14 @@ def genLines (defines):
         yield line
     # add VK_API_MAX_FRAMEWORK_VERSION
     major, minor = 1, 0
-    for feature in reversed(api.features):
-        if feature.api == api.apiName:
+    # In vk.xml, vulkan features (1.1, 1.2, 1.3) are marked as vulkan,vulkansc
+    api_feature_name = "vulkan,vulkansc" if api.apiName == "vulkan" else api.apiName
+    sorted_features = reversed(sorted(api.features, key=lambda feature: feature.number))
+    for feature in sorted_features:
+        if feature.api == api_feature_name:
             major, minor = feature.number.split('.')
             break
+    logging.debug("Found max framework version for API '%s': %s.%s" % (api.apiName, major, minor))
     yield f"#define VK{apiName}_API_MAX_FRAMEWORK_VERSION\tVK{apiName}_API_VERSION_{major}_{minor}"
 
 def genHandlesSrc (handles):