diff --git a/include/vulkan/vulkan_sc_core.h b/include/vulkan/vulkan_sc_core.h index df4ed64..a4b577e 100644 --- a/include/vulkan/vulkan_sc_core.h +++ b/include/vulkan/vulkan_sc_core.h @@ -59,13 +59,13 @@ extern "C" { #endif #define VK_MAKE_API_VERSION(variant, major, minor, patch) \ - ((((uint32_t)(variant)) << 29) | (((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) + ((((uint32_t)(variant)) << 29U) | (((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch))) // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 11 +#define VK_HEADER_VERSION 12 // Vulkan SC variant number #define VKSC_API_VARIANT 1 @@ -73,9 +73,9 @@ extern "C" { // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, VK_HEADER_VERSION) -#define VK_API_VERSION_VARIANT(version) ((uint32_t)(version) >> 29) -#define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22) & 0x7FU) -#define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3FFU) +#define VK_API_VERSION_VARIANT(version) ((uint32_t)(version) >> 29U) +#define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22U) & 0x7FU) +#define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU) #define VK_API_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU) typedef uint32_t VkBool32; typedef uint64_t VkDeviceAddress; @@ -478,7 +478,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_EXPORT_MEMORY_SCI_BUF_INFO_NV = 1000374001, VK_STRUCTURE_TYPE_MEMORY_GET_SCI_BUF_INFO_NV = 1000374002, VK_STRUCTURE_TYPE_MEMORY_SCI_BUF_PROPERTIES_NV = 1000374003, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_BUF_FEATURES_NV = 1000374004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCI_BUF_FEATURES_NV = 1000374004, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT = 1000377000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, @@ -487,6 +487,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SEMAPHORE_SCI_SYNC_CREATE_INFO_NV = 1000489001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_SYNC_2_FEATURES_NV = 1000489002, VK_STRUCTURE_TYPE_DEVICE_SEMAPHORE_SCI_SYNC_POOL_RESERVATION_CREATE_INFO_NV = 1000489003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_BUF_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCI_BUF_FEATURES_NV, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF } VkStructureType; @@ -547,9 +548,7 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000, VK_OBJECT_TYPE_DISPLAY_MODE_KHR = 1000002001, VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT = 1000128000, -#ifdef VK_USE_PLATFORM_SCI VK_OBJECT_TYPE_SEMAPHORE_SCI_SYNC_POOL_NV = 1000489000, -#endif VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF } VkObjectType; diff --git a/include/vulkan/vulkan_sc_core.hpp b/include/vulkan/vulkan_sc_core.hpp index 7d716d1..6425585 100644 --- a/include/vulkan/vulkan_sc_core.hpp +++ b/include/vulkan/vulkan_sc_core.hpp @@ -59,13 +59,13 @@ extern "C" { #endif #define VK_MAKE_API_VERSION(variant, major, minor, patch) \ - (((static_cast(variant)) << 29) | ((static_cast(major)) << 22) | ((static_cast(minor)) << 12) | (static_cast(patch))) + (((static_cast(variant)) << 29U) | ((static_cast(major)) << 22U) | ((static_cast(minor)) << 12U) | (static_cast(patch))) // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 11 +#define VK_HEADER_VERSION 12 // Vulkan SC variant number #define VKSC_API_VARIANT 1 @@ -73,9 +73,9 @@ extern "C" { // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, VK_HEADER_VERSION) -#define VK_API_VERSION_VARIANT(version) (static_cast(version) >> 29) -#define VK_API_VERSION_MAJOR(version) ((static_cast(version) >> 22) & 0x7FU) -#define VK_API_VERSION_MINOR(version) ((static_cast(version) >> 12) & 0x3FFU) +#define VK_API_VERSION_VARIANT(version) (static_cast(version) >> 29U) +#define VK_API_VERSION_MAJOR(version) ((static_cast(version) >> 22U) & 0x7FU) +#define VK_API_VERSION_MINOR(version) ((static_cast(version) >> 12U) & 0x3FFU) #define VK_API_VERSION_PATCH(version) (static_cast(version) & 0xFFFU) typedef uint32_t VkBool32; typedef uint64_t VkDeviceAddress; @@ -478,7 +478,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_EXPORT_MEMORY_SCI_BUF_INFO_NV = 1000374001, VK_STRUCTURE_TYPE_MEMORY_GET_SCI_BUF_INFO_NV = 1000374002, VK_STRUCTURE_TYPE_MEMORY_SCI_BUF_PROPERTIES_NV = 1000374003, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_BUF_FEATURES_NV = 1000374004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCI_BUF_FEATURES_NV = 1000374004, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT = 1000377000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, @@ -487,6 +487,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SEMAPHORE_SCI_SYNC_CREATE_INFO_NV = 1000489001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_SYNC_2_FEATURES_NV = 1000489002, VK_STRUCTURE_TYPE_DEVICE_SEMAPHORE_SCI_SYNC_POOL_RESERVATION_CREATE_INFO_NV = 1000489003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_BUF_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCI_BUF_FEATURES_NV, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF } VkStructureType; @@ -547,9 +548,7 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000, VK_OBJECT_TYPE_DISPLAY_MODE_KHR = 1000002001, VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT = 1000128000, -#ifdef VK_USE_PLATFORM_SCI VK_OBJECT_TYPE_SEMAPHORE_SCI_SYNC_POOL_NV = 1000489000, -#endif VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF } VkObjectType; diff --git a/include/vulkan/vulkan_sci.h b/include/vulkan/vulkan_sci.h index 73e48c4..ed66d86 100644 --- a/include/vulkan/vulkan_sci.h +++ b/include/vulkan/vulkan_sci.h @@ -137,7 +137,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreSciSyncObjNV( #define VK_NV_external_memory_sci_buf 1 -#define VK_NV_EXTERNAL_MEMORY_SCI_BUF_SPEC_VERSION 1 +#define VK_NV_EXTERNAL_MEMORY_SCI_BUF_SPEC_VERSION 2 #define VK_NV_EXTERNAL_MEMORY_SCI_BUF_EXTENSION_NAME "VK_NV_external_memory_sci_buf" typedef struct VkExportMemorySciBufInfoNV { VkStructureType sType; @@ -165,12 +165,14 @@ typedef struct VkMemorySciBufPropertiesNV { uint32_t memoryTypeBits; } VkMemorySciBufPropertiesNV; -typedef struct VkPhysicalDeviceExternalSciBufFeaturesNV { +typedef struct VkPhysicalDeviceExternalMemorySciBufFeaturesNV { VkStructureType sType; - const void* pNext; + void* pNext; VkBool32 sciBufImport; VkBool32 sciBufExport; -} VkPhysicalDeviceExternalSciBufFeaturesNV; +} VkPhysicalDeviceExternalMemorySciBufFeaturesNV; + +typedef VkPhysicalDeviceExternalMemorySciBufFeaturesNV VkPhysicalDeviceExternalSciBufFeaturesNV; typedef VkResult (VKAPI_PTR *PFN_vkGetMemorySciBufNV)(VkDevice device, const VkMemoryGetSciBufInfoNV* pGetSciBufInfo, NvSciBufObj* pHandle); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalMemorySciBufPropertiesNV)(VkPhysicalDevice physicalDevice, VkExternalMemoryHandleTypeFlagBits handleType, NvSciBufObj handle, VkMemorySciBufPropertiesNV* pMemorySciBufProperties); @@ -227,7 +229,6 @@ typedef struct VkDeviceSemaphoreSciSyncPoolReservationCreateInfoNV { } VkDeviceSemaphoreSciSyncPoolReservationCreateInfoNV; typedef VkResult (VKAPI_PTR *PFN_vkCreateSemaphoreSciSyncPoolNV)(VkDevice device, const VkSemaphoreSciSyncPoolCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphoreSciSyncPoolNV* pSemaphorePool); -typedef void (VKAPI_PTR *PFN_vkDestroySemaphoreSciSyncPoolNV)(VkDevice device, VkSemaphoreSciSyncPoolNV semaphorePool, const VkAllocationCallbacks* pAllocator); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkCreateSemaphoreSciSyncPoolNV( @@ -235,11 +236,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSemaphoreSciSyncPoolNV( const VkSemaphoreSciSyncPoolCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphoreSciSyncPoolNV* pSemaphorePool); - -VKAPI_ATTR void VKAPI_CALL vkDestroySemaphoreSciSyncPoolNV( - VkDevice device, - VkSemaphoreSciSyncPoolNV semaphorePool, - const VkAllocationCallbacks* pAllocator); #endif #ifdef __cplusplus diff --git a/registry/genvk.py b/registry/genvk.py index a0f0f70..53c6d46 100755 --- a/registry/genvk.py +++ b/registry/genvk.py @@ -595,10 +595,10 @@ def makeGenOpts(args): profile = None, versions = featuresPat, emitversions = featuresPat, - defaultExtensions = defaultExtensions, + defaultExtensions = None, addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, + removeExtensions = None, + emitExtensions = None, vulkanLayer = vulkanLayer, prefixText = prefixStrings + vkPrefixStrings, genFuncPointers = True, @@ -640,6 +640,11 @@ def makeGenOpts(args): alignFuncParam = 48) ] + # keep any relevant platform extensions for the following generators + # (needed for e.g. the vulkan_sci extensions) + explicitRemoveExtensionsPat = makeREstring( + removeExtensions, None, strings_are_regex=True) + # Raw C header file generator. genOpts['vulkan_json_gen.h'] = [ JSONHeaderOutputGenerator, @@ -653,7 +658,7 @@ def makeGenOpts(args): emitversions = scVersions, defaultExtensions = 'vulkansc', addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, + removeExtensions = explicitRemoveExtensionsPat, emitExtensions = emitExtensionsPat, prefixText = prefixStrings + vkPrefixStrings, genFuncPointers = True, @@ -680,7 +685,7 @@ def makeGenOpts(args): emitversions = scVersions, defaultExtensions = 'vulkansc', addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, + removeExtensions = explicitRemoveExtensionsPat, emitExtensions = emitExtensionsPat, prefixText = prefixStrings + vkPrefixStrings, genFuncPointers = True, @@ -706,7 +711,7 @@ def makeGenOpts(args): emitversions = scVersions, defaultExtensions = 'vulkansc', addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, + removeExtensions = explicitRemoveExtensionsPat, emitExtensions = emitExtensionsPat, prefixText = prefixStrings + vkPrefixStrings, genFuncPointers = True, diff --git a/registry/validusage.json b/registry/validusage.json index d872d24..d3be3df 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.0.11", - "comment": "from git branch: github-sc_main commit: 0caf3f1da2ce143a0f500d7f4083fe2899a31f30", - "date": "2022-09-13 03:42:50Z" + "api version": "1.0.12", + "comment": "from git branch: github-sc_main commit: 1e1d007aa441c1df2f2f35d7aef7dc9731fafd48", + "date": "2023-01-25 05:30:01Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -136,7 +136,7 @@ "(VKSC_VERSION_1_0)": [ { "vuid": "VUID-VkApplicationInfo-apiVersion-05021", - "text": " If apiVersion is not 0, then it must be greater than or equal to VKSC_API_VERSION_1_0" + "text": " If apiVersion is not 0 and its variant is VKSC_API_VARIANT, then it must be greater than or equal to VKSC_API_VERSION_1_0" } ], "(VK_EXT_application_parameters)": [ @@ -626,7 +626,7 @@ }, { "vuid": "VUID-VkDeviceCreateInfo-pNext-pNext", - "text": " Each pNext member of any structure (including this one) in the pNext chain must be either NULL or a pointer to a valid instance of VkApplicationParametersEXT, VkDeviceGroupDeviceCreateInfo, VkDeviceObjectReservationCreateInfo, VkFaultCallbackInfo, VkPhysicalDevice16BitStorageFeatures, VkPhysicalDevice4444FormatsFeaturesEXT, VkPhysicalDevice8BitStorageFeatures, VkPhysicalDeviceASTCDecodeFeaturesEXT, VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT, VkPhysicalDeviceBufferDeviceAddressFeatures, VkPhysicalDeviceColorWriteEnableFeaturesEXT, VkPhysicalDeviceCustomBorderColorFeaturesEXT, VkPhysicalDeviceDepthClipEnableFeaturesEXT, VkPhysicalDeviceDescriptorIndexingFeatures, VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, VkPhysicalDeviceExtendedDynamicStateFeaturesEXT, VkPhysicalDeviceExternalSciBufFeaturesNV, VkPhysicalDeviceExternalSciSync2FeaturesNV, VkPhysicalDeviceExternalSciSyncFeaturesNV, VkPhysicalDeviceFeatures2, VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, VkPhysicalDeviceFragmentShadingRateFeaturesKHR, VkPhysicalDeviceHostQueryResetFeatures, VkPhysicalDeviceImageRobustnessFeaturesEXT, VkPhysicalDeviceImagelessFramebufferFeatures, VkPhysicalDeviceIndexTypeUint8FeaturesEXT, VkPhysicalDeviceLineRasterizationFeaturesEXT, VkPhysicalDeviceMultiviewFeatures, VkPhysicalDevicePerformanceQueryFeaturesKHR, VkPhysicalDeviceProtectedMemoryFeatures, VkPhysicalDeviceRobustness2FeaturesEXT, VkPhysicalDeviceSamplerYcbcrConversionFeatures, VkPhysicalDeviceScalarBlockLayoutFeatures, VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures, VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, VkPhysicalDeviceShaderAtomicInt64Features, VkPhysicalDeviceShaderClockFeaturesKHR, VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT, VkPhysicalDeviceShaderDrawParametersFeatures, VkPhysicalDeviceShaderFloat16Int8Features, VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT, VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures, VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR, VkPhysicalDeviceSubgroupSizeControlFeaturesEXT, VkPhysicalDeviceSynchronization2FeaturesKHR, VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT, VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT, VkPhysicalDeviceTimelineSemaphoreFeatures, VkPhysicalDeviceUniformBufferStandardLayoutFeatures, VkPhysicalDeviceVariablePointersFeatures, VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT, VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT, VkPhysicalDeviceVulkan11Features, VkPhysicalDeviceVulkan12Features, VkPhysicalDeviceVulkanMemoryModelFeatures, VkPhysicalDeviceVulkanSC10Features, VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT, or VkPhysicalDeviceYcbcrImageArraysFeaturesEXT" + "text": " Each pNext member of any structure (including this one) in the pNext chain must be either NULL or a pointer to a valid instance of VkApplicationParametersEXT, VkDeviceGroupDeviceCreateInfo, VkDeviceObjectReservationCreateInfo, VkFaultCallbackInfo, VkPhysicalDevice16BitStorageFeatures, VkPhysicalDevice4444FormatsFeaturesEXT, VkPhysicalDevice8BitStorageFeatures, VkPhysicalDeviceASTCDecodeFeaturesEXT, VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT, VkPhysicalDeviceBufferDeviceAddressFeatures, VkPhysicalDeviceColorWriteEnableFeaturesEXT, VkPhysicalDeviceCustomBorderColorFeaturesEXT, VkPhysicalDeviceDepthClipEnableFeaturesEXT, VkPhysicalDeviceDescriptorIndexingFeatures, VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, VkPhysicalDeviceExtendedDynamicStateFeaturesEXT, VkPhysicalDeviceExternalMemorySciBufFeaturesNV, VkPhysicalDeviceExternalSciSync2FeaturesNV, VkPhysicalDeviceExternalSciSyncFeaturesNV, VkPhysicalDeviceFeatures2, VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, VkPhysicalDeviceFragmentShadingRateFeaturesKHR, VkPhysicalDeviceHostQueryResetFeatures, VkPhysicalDeviceImageRobustnessFeaturesEXT, VkPhysicalDeviceImagelessFramebufferFeatures, VkPhysicalDeviceIndexTypeUint8FeaturesEXT, VkPhysicalDeviceLineRasterizationFeaturesEXT, VkPhysicalDeviceMultiviewFeatures, VkPhysicalDevicePerformanceQueryFeaturesKHR, VkPhysicalDeviceProtectedMemoryFeatures, VkPhysicalDeviceRobustness2FeaturesEXT, VkPhysicalDeviceSamplerYcbcrConversionFeatures, VkPhysicalDeviceScalarBlockLayoutFeatures, VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures, VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, VkPhysicalDeviceShaderAtomicInt64Features, VkPhysicalDeviceShaderClockFeaturesKHR, VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT, VkPhysicalDeviceShaderDrawParametersFeatures, VkPhysicalDeviceShaderFloat16Int8Features, VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT, VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures, VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR, VkPhysicalDeviceSubgroupSizeControlFeaturesEXT, VkPhysicalDeviceSynchronization2FeaturesKHR, VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT, VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT, VkPhysicalDeviceTimelineSemaphoreFeatures, VkPhysicalDeviceUniformBufferStandardLayoutFeatures, VkPhysicalDeviceVariablePointersFeatures, VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT, VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT, VkPhysicalDeviceVulkan11Features, VkPhysicalDeviceVulkan12Features, VkPhysicalDeviceVulkanMemoryModelFeatures, VkPhysicalDeviceVulkanSC10Features, VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT, or VkPhysicalDeviceYcbcrImageArraysFeaturesEXT" }, { "vuid": "VUID-VkDeviceCreateInfo-sType-unique", @@ -750,7 +750,7 @@ "(VKSC_VERSION_1_0)": [ { "vuid": "VUID-vkDestroyDevice-device-05137", - "text": " All child objects created on device except query pools, descriptor pools, command pools, and device memory must have been destroyed prior to destroying device" + "text": " All child objects created on device, except those with no explicit free or destroy command, must have been destroyed prior to destroying device" } ], "!(VKSC_VERSION_1_0)": [ @@ -1884,10 +1884,6 @@ "vuid": "VUID-VkSubmitInfo-pWaitDstStageMask-parameter", "text": " If waitSemaphoreCount is not 0, pWaitDstStageMask must be a valid pointer to an array of waitSemaphoreCount valid combinations of VkPipelineStageFlagBits values" }, - { - "vuid": "VUID-VkSubmitInfo-pWaitDstStageMask-requiredbitmask", - "text": " Each element of pWaitDstStageMask must not be 0" - }, { "vuid": "VUID-VkSubmitInfo-pCommandBuffers-parameter", "text": " If commandBufferCount is not 0, pCommandBuffers must be a valid pointer to an array of commandBufferCount valid VkCommandBuffer handles" @@ -3397,7 +3393,7 @@ ] }, "vkDestroySemaphoreSciSyncPoolNV": { - "(VK_NV_external_sci_sync2)": [ + "(VK_NV_external_sci_sync2)+!(VKSC_VERSION_1_0)": [ { "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-semaphorePool-05153", "text": " All submitted batches that refer to a semaphore created from semaphorePool must have completed execution" @@ -3405,22 +3401,6 @@ { "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-sciSyncSemaphore2-05154", "text": " The VkPhysicalDeviceExternalSciSync2FeaturesNV::sciSyncSemaphore2 feature must be enabled" - }, - { - "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-device-parameter", - "text": " device must be a valid VkDevice handle" - }, - { - "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-semaphorePool-parameter", - "text": " If semaphorePool is not VK_NULL_HANDLE, semaphorePool must be a valid VkSemaphoreSciSyncPoolNV handle" - }, - { - "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-pAllocator-null", - "text": " pAllocator must be NULL" - }, - { - "vuid": "VUID-vkDestroySemaphoreSciSyncPoolNV-semaphorePool-parent", - "text": " If semaphorePool is a valid handle, it must have been created, allocated, or retrieved from device" } ] }, @@ -7161,11 +7141,11 @@ "text": " The number of {objectnameplural} currently allocated from device plus {objectcount} must be less than or equal to the total number of {objectnameplural} requested via VkDeviceObjectReservationCreateInfo::pname:{objectnamecamelcase}RequestCount specified when device was created" }, { - "vuid": "VUID-vkCreateRenderPass-device-05089", + "vuid": "VUID-vkCreateRenderPass-subpasses-device-05089", "text": " The number of subpasses currently allocated from device across all slink:VkRenderPass objects plus pname:pCreateInfo->subpassCount must be less than or equal to the total number of subpasses requested via VkDeviceObjectReservationCreateInfo::pname:subpassDescriptionRequestCount specified when device was created" }, { - "vuid": "VUID-vkCreateRenderPass-device-05089", + "vuid": "VUID-vkCreateRenderPass-attachments-device-05089", "text": " The number of attachments currently allocated from device across all slink:VkRenderPass objects plus pname:pCreateInfo->attachmentCount must be less than or equal to the total number of attachments requested via VkDeviceObjectReservationCreateInfo::pname:attachmentDescriptionRequestCount specified when device was created" } ], @@ -7851,11 +7831,11 @@ "text": " The number of {objectnameplural} currently allocated from device plus {objectcount} must be less than or equal to the total number of {objectnameplural} requested via VkDeviceObjectReservationCreateInfo::pname:{objectnamecamelcase}RequestCount specified when device was created" }, { - "vuid": "VUID-vkCreateRenderPass2-device-05089", + "vuid": "VUID-vkCreateRenderPass2-subpasses-device-05089", "text": " The number of subpasses currently allocated from device across all slink:VkRenderPass objects plus pname:pCreateInfo->subpassCount must be less than or equal to the total number of subpasses requested via VkDeviceObjectReservationCreateInfo::pname:subpassDescriptionRequestCount specified when device was created" }, { - "vuid": "VUID-vkCreateRenderPass2-device-05089", + "vuid": "VUID-vkCreateRenderPass2-attachments-device-05089", "text": " The number of attachments currently allocated from device across all slink:VkRenderPass objects plus pname:pCreateInfo->attachmentCount must be less than or equal to the total number of attachments requested via VkDeviceObjectReservationCreateInfo::pname:attachmentDescriptionRequestCount specified when device was created" } ], @@ -12502,11 +12482,11 @@ "(VK_NV_external_memory_sci_buf)": [ { "vuid": "VUID-VkMemoryAllocateInfo-pNext-05097", - "text": " If the pNext chain includes a VkExportMemorySciBufInfoNV structure, VkPhysicalDeviceExternalSciBufFeaturesNV::sciBufExport must be enabled" + "text": " If the pNext chain includes a VkExportMemorySciBufInfoNV structure, VkPhysicalDeviceExternalMemorySciBufFeaturesNV::sciBufExport must be enabled" }, { "vuid": "VUID-VkMemoryAllocateInfo-pNext-05098", - "text": " If the pNext chain includes a VkImportMemorySciBufInfoNV structure, VkPhysicalDeviceExternalSciBufFeaturesNV::sciBufImport must be enabled" + "text": " If the pNext chain includes a VkImportMemorySciBufInfoNV structure, VkPhysicalDeviceExternalMemorySciBufFeaturesNV::sciBufImport must be enabled" }, { "vuid": "VUID-VkMemoryAllocateInfo-memoryTypeIndex-05099", @@ -13134,7 +13114,7 @@ }, { "vuid": "VUID-vkGetPhysicalDeviceExternalMemorySciBufPropertiesNV-sciBufImport-05105", - "text": " VkPhysicalDeviceExternalSciBufFeaturesNV::sciBufImport must be enabled" + "text": " VkPhysicalDeviceExternalMemorySciBufFeaturesNV::sciBufImport must be enabled" }, { "vuid": "VUID-vkGetPhysicalDeviceExternalMemorySciBufPropertiesNV-physicalDevice-parameter", @@ -17033,7 +17013,7 @@ "text": " The number of {objectnameplural} currently allocated from device plus {objectcount} must be less than or equal to the total number of {objectnameplural} requested via VkDeviceObjectReservationCreateInfo::pname:{objectnamecamelcase}RequestCount specified when device was created" }, { - "vuid": "VUID-vkCreateDescriptorSetLayout-device-05089", + "vuid": "VUID-vkCreateDescriptorSetLayout-layoutbindings-device-05089", "text": " The number of descriptor set layout bindings currently allocated from device across all slink:VkDescriptorSetLayout objects plus pname:pCreateInfo->bindingCount must be less than or equal to the total number of descriptor set layout bindings requested via VkDeviceObjectReservationCreateInfo::pname:descriptorSetLayoutBindingRequestCount specified when device was created" } ], @@ -39412,11 +39392,11 @@ } ] }, - "VkPhysicalDeviceExternalSciBufFeaturesNV": { + "VkPhysicalDeviceExternalMemorySciBufFeaturesNV": { "(VK_NV_external_memory_sci_buf)": [ { - "vuid": "VUID-VkPhysicalDeviceExternalSciBufFeaturesNV-sType-sType", - "text": " sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SCI_BUF_FEATURES_NV" + "vuid": "VUID-VkPhysicalDeviceExternalMemorySciBufFeaturesNV-sType-sType", + "text": " sType must be VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCI_BUF_FEATURES_NV" } ] }, @@ -40745,14 +40725,6 @@ { "vuid": "VUID-VkFaultData-sType-sType", "text": " sType must be VK_STRUCTURE_TYPE_FAULT_DATA" - }, - { - "vuid": "VUID-VkFaultData-faultLevel-parameter", - "text": " faultLevel must be a valid VkFaultLevel value" - }, - { - "vuid": "VUID-VkFaultData-faultType-parameter", - "text": " faultType must be a valid VkFaultType value" } ] }, diff --git a/registry/vk.xml b/registry/vk.xml index 3c3a199..000f595 100644 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -139,19 +139,19 @@ branch of the member gitlab server. // DEPRECATED: This define is deprecated. VK_MAKE_API_VERSION should be used instead. #define VK_MAKE_VERSION(major, minor, patch) \ - ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) + ((((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch))) // DEPRECATED: This define is deprecated. VK_API_VERSION_MAJOR should be used instead. -#define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) +#define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22U) // DEPRECATED: This define is deprecated. VK_API_VERSION_MINOR should be used instead. -#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3FFU) +#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU) // DEPRECATED: This define is deprecated. VK_API_VERSION_PATCH should be used instead. #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU) #define VK_MAKE_API_VERSION(variant, major, minor, patch) \ - ((((uint32_t)(variant)) << 29) | (((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) - #define VK_API_VERSION_VARIANT(version) ((uint32_t)(version) >> 29) - #define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22) & 0x7FU) - #define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3FFU) + ((((uint32_t)(variant)) << 29U) | (((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch))) + #define VK_API_VERSION_VARIANT(version) ((uint32_t)(version) >> 29U) + #define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22U) & 0x7FU) + #define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU) #define VK_API_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU) // Vulkan SC variant number @@ -174,7 +174,7 @@ branch of the member gitlab server. #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) // Version of this file -#define VK_HEADER_VERSION 11 +#define VK_HEADER_VERSION 12 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, VK_HEADER_VERSION) @@ -1865,7 +1865,7 @@ typedef void CAMetalLayer; const void* pNext uint32_t waitSemaphoreCount const VkSemaphore* pWaitSemaphores - const VkPipelineStageFlags* pWaitDstStageMask + const VkPipelineStageFlags* pWaitDstStageMask uint32_t commandBufferCount const VkCommandBuffer* pCommandBuffers uint32_t signalSemaphoreCount @@ -2164,12 +2164,13 @@ typedef void CAMetalLayer; const void* pNext uint32_t memoryTypeBits - - VkStructureType sType - const void* pNext + + VkStructureType sType + void* pNext VkBool32 sciBufImport VkBool32 sciBufExport + VkStructureType sType const void* pNext @@ -5177,7 +5178,7 @@ typedef void CAMetalLayer; void* pNext VkBool32 deviceCoherentMemory - + VkStructureType sType void* pNext VkFaultLevel faultLevel @@ -8645,12 +8646,19 @@ typedef void CAMetalLayer; uint32_t* pPropertyCount VkExtensionProperties* pProperties - + VkResult vkEnumerateDeviceLayerProperties VkPhysicalDevice physicalDevice uint32_t* pPropertyCount VkLayerProperties* pProperties + + VkResult vkEnumerateDeviceLayerProperties + VkPhysicalDevice physicalDevice + uint32_t* pPropertyCount + VkLayerProperties* pProperties + + VkResult vkEnumerateDeviceExtensionProperties VkPhysicalDevice physicalDevice @@ -12931,6 +12939,8 @@ typedef void CAMetalLayer; + + @@ -17791,18 +17801,20 @@ typedef void CAMetalLayer; - + - + + + @@ -18302,7 +18314,7 @@ typedef void CAMetalLayer; - +