Update supported Vulkan spec to 1.3.281

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Arm Software
+Copyright (c) 2022 - 2024 Arm Limited
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

scripts/struct.py

@@ -12,7 +12,12 @@
 	'VkVideoDecodeH264CapabilitiesKHR', 'VkVideoDecodeH264SessionParametersAddInfoKHR', 'VkVideoDecodeH264ProfileInfoKHR', 'VkVideoDecodeH264SessionParametersCreateInfoKHR',
 	'VkVideoDecodeH264PictureInfoKHR', 'VkVideoDecodeH264DpbSlotInfoKHR', 'VkVideoDecodeH265ProfileInfoKHR', 'VkVideoDecodeH265SessionParametersAddInfoKHR',
 	'VkVideoDecodeH265CapabilitiesKHR', 'VkVideoDecodeH265SessionParametersCreateInfoKHR', 'VkVideoDecodeH265PictureInfoKHR', 'VkVideoDecodeH265DpbSlotInfoKHR',
-	'VkOpaqueCaptureDescriptorDataCreateInfoEXT' ]
+	'VkOpaqueCaptureDescriptorDataCreateInfoEXT',
+	'VkPushDescriptorSetWithTemplateInfoKHR',
+	'VkMemoryMapPlacedInfoEXT',
+	'VkBindMemoryStatusKHR',
+	'VkRenderingInputAttachmentIndexInfoKHR',
+]
 
 hardcoded_read = [ 'VkAccelerationStructureBuildGeometryInfoKHR' ]
 hardcoded_write = []

scripts/util.py

@@ -91,7 +91,8 @@
 	'vkGetPipelinePropertiesEXT', 'vkUpdateDescriptorSetWithTemplate', 'vkCmdUpdateBuffer', 'vkGetBufferOpaqueCaptureDescriptorDataEXT',
 	'vkCmdBuildMicromapsEXT', 'vkBuildMicromapsEXT', 'vkGetMicromapBuildSizesEXT', 'vkGetImageOpaqueCaptureDescriptorDataEXT', 'vkGetSamplerOpaqueCaptureDescriptorDataEXT',
 	'vkGetDeviceFaultInfoEXT', # we never want to trace this, but rather inject it during tracing if device loss happens, print the info, then abort
-	'vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT'
+	'vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT', 'vkCmdPushDescriptorSetWithTemplate2KHR', 'vkCmdSetRenderingInputAttachmentIndicesKHR',
+	'vkGetEncodedVideoSessionParametersKHR',
 ]
 struct_noop = []
 
@@ -391,20 +392,18 @@ def __init__(self, node, read, funcname, transitiveConst = False):
 			self.length = self.length.replace(',1', '')
 		if self.length and '::' in self.length:
 			self.length = self.length.replace('::','->')
-		if not self.length and '[' in raw: # ie fixed length array
-			length = node.find('enum')
-			if length is not None:
-				self.length = length.text
-			else: # naked numeral
-				self.length = getsize(raw)
+		if '[' in raw: # fixed length array?
+			enum_length = node.find('enum')
+			if enum_length: self.length = length.text # an enum define
+			else: self.length = getsize(raw) # a numeric value
 		if self.length and (self.length.isdigit() or self.length.isupper()):
 			self.fixedsize = True # fixed length array
 		self.structure = self.type in spec.structures
 		self.disphandle = self.type in spec.disp_handles
 		self.nondisphandle = self.type in spec.nondisp_handles
 		self.inparam = (not self.ptr or self.const) # else out parameter
 		self.string_array = self.length and ',null-terminated' in self.length and self.type == 'char'
-		self.string = self.length == 'null-terminated' and self.type == 'char'
+		self.string = self.length == 'null-terminated' and self.type == 'char' and not self.string_array and not self.fixedsize
 		self.read = read
 
 		# We need to be really defensive and treat all pointers as potentially optional. We cannot trust the optional XML
@@ -646,6 +645,9 @@ def print_load(self, name, owner): # called for each parameter
 				storedname = z.tmpmem('float', '%s * 4' % self.length)
 				z.do('reader.read_array(%s, %s * 4); // read VkClearValue into temporary' % (storedname, self.length))
 				z.do('%s = reinterpret_cast<VkClearValue*>(%s);' % (varname, storedname))
+		elif self.type in spec.packed_bitfields:
+			storedtype = spec.type_mappings[self.type]
+			z.do('%s = (%s)reader.read_%s_t();' % (self.type, varname, storedtype))
 		elif self.type in spec.type_mappings:
 			storedtype = spec.type_mappings[self.type]
 			nativetype = self.type if self.type != 'void' else 'char'
@@ -970,6 +972,9 @@ def print_save(self, name, owner): # called for each parameter
 				z.do('for (unsigned s = 0; s < (unsigned)(%s); s++) writer.write_%s(%s[s]);' % (self.length, spec.type_mappings[self.type], varname))
 			else: # no, just write out as is
 				z.do('writer.write_array(reinterpret_cast<const char*>(%s), %s * sizeof(%s));' % (varname, self.length, self.type if self.type != 'void' else 'char'))
+		elif self.type in spec.packed_bitfields:
+			storedtype = spec.type_mappings[self.type]
+			z.do('writer.write_%s_t((%s)%s);' % (storedtype, storedtype, varname))
 		elif self.ptr and self.type in spec.type_mappings:
 			z.do('writer.write_%s(*%s);' % (spec.type_mappings[self.type], varname))
 		elif self.ptr:

src/hardcode_read.cpp

@@ -93,6 +93,8 @@ static uint64_t debug_object_lookup(VkDebugReportObjectTypeEXT type, uint32_t in
 	case VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT: return (uint64_t)index_to_VkValidationCacheEXT.at(index);
 	case VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR_EXT: return (uint64_t)index_to_VkSamplerYcbcrConversion.at(index);
 	// these are not supported:
+	case VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT:
+	case VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_CU_MODULE_NVX_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_CU_FUNCTION_NVX_EXT:
@@ -150,6 +152,8 @@ static uint64_t object_lookup(VkObjectType type, uint32_t index)
 	case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: return (uint64_t)index_to_VkDebugReportCallbackEXT.at(index);
 	case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: return (uint64_t)index_to_VkDebugUtilsMessengerEXT.at(index);
 	// these are not supported:
+	case VK_OBJECT_TYPE_CUDA_MODULE_NV:
+	case VK_OBJECT_TYPE_CUDA_FUNCTION_NV:
 	case VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV:
 	case VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA:
 	case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV:

src/hardcode_write.cpp

@@ -71,6 +71,8 @@ static trackable* debug_object_trackable(trace_records& r, VkDebugReportObjectTy
 	case VK_DEBUG_REPORT_OBJECT_TYPE_CU_MODULE_NVX_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT:
+	case VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT:
+	case VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT:
 	case VK_DEBUG_REPORT_OBJECT_TYPE_MAX_ENUM_EXT: assert(false); return nullptr;
 	}
 	return nullptr;
@@ -122,6 +124,8 @@ static trackable* object_trackable(const trace_records& r, VkObjectType type, ui
 	case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: return r.VkDebugReportCallbackEXT_index.at((const VkDebugReportCallbackEXT)object);
 	case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: return r.VkDebugUtilsMessengerEXT_index.at((const VkDebugUtilsMessengerEXT)object);
 	// not supported:
+	case VK_OBJECT_TYPE_CUDA_MODULE_NV:
+	case VK_OBJECT_TYPE_CUDA_FUNCTION_NV:
 	case VK_OBJECT_TYPE_CU_MODULE_NVX:
 	case VK_OBJECT_TYPE_CU_FUNCTION_NVX:
 	case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV:

src/util.cpp

@@ -146,6 +146,7 @@ const char* errorString(const VkResult errorCode)
 	STR(ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR);
 	STR(ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR);
 	STR(ERROR_INCOMPATIBLE_SHADER_BINARY_EXT);
+	STR(ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR);
 #undef STR
 	case VK_RESULT_MAX_ENUM:
 		return "(bad error code)";
@@ -386,6 +387,8 @@ const char* pretty_print_VkObjectType(VkObjectType val)
 	case VK_OBJECT_TYPE_VIDEO_SESSION_KHR: return "VideoSession";
 	case VK_OBJECT_TYPE_VIDEO_SESSION_PARAMETERS_KHR: return "VideoSessionParameters";
 	case VK_OBJECT_TYPE_SHADER_EXT: return "Shader";
+	case VK_OBJECT_TYPE_CUDA_MODULE_NV: return "CudaModule";
+	case VK_OBJECT_TYPE_CUDA_FUNCTION_NV: return "CudaFunction";
 	}
 	return "Error";
 }