From 6ba742e334bda25adf358dc030ba747afec56f36 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 26 Nov 2025 21:48:50 -0800 Subject: [PATCH] venus: sync to latest protocol for v1.4.334 This also includes enabling the promoted VK_KHR_robustness2. Part-of: --- .../venus-protocol/vn_protocol_driver.h | 2 +- .../vn_protocol_driver_device.h | 172 +++++++++--------- .../venus-protocol/vn_protocol_driver_info.h | 9 +- .../venus-protocol/vn_protocol_driver_types.h | 21 +++ 4 files changed, 113 insertions(+), 91 deletions(-) diff --git a/src/virtio/venus-protocol/vn_protocol_driver.h b/src/virtio/venus-protocol/vn_protocol_driver.h index 1550491e60c..ab2016f48f3 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver.h +++ b/src/virtio/venus-protocol/vn_protocol_driver.h @@ -1,4 +1,4 @@ -/* This file is generated by venus-protocol git-7157163d. */ +/* This file is generated by venus-protocol git-9dfd71b8. */ /* * Copyright 2020 Google LLC diff --git a/src/virtio/venus-protocol/vn_protocol_driver_device.h b/src/virtio/venus-protocol/vn_protocol_driver_device.h index 43eed189144..2eddf46232a 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_device.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_device.h @@ -10664,17 +10664,17 @@ vn_encode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_partial(st vn_encode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self_partial(enc, val); } -/* struct VkPhysicalDeviceRobustness2FeaturesEXT chain */ +/* struct VkPhysicalDeviceRobustness2FeaturesKHR chain */ static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(const void *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self(const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self(const VkPhysicalDeviceRobustness2FeaturesKHR *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -10685,26 +10685,26 @@ vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self(const VkPhysicalDeviceRobu } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT(const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR(const VkPhysicalDeviceRobustness2FeaturesKHR *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(val->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self(val); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(val->pNext); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self(val); return size; } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(struct vn_cs_encoder *enc, const void *val) { /* no known/supported struct */ vn_encode_simple_pointer(enc, NULL); } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesKHR *val) { /* skip val->{sType,pNext} */ vn_encode_VkBool32(enc, &val->robustBufferAccess2); @@ -10713,16 +10713,16 @@ vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self(struct vn_cs_encoder *enc, } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesKHR *val) { - assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT }); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(enc, val->pNext); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR }); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(enc, val->pNext); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self(enc, val); } static inline void -vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(struct vn_cs_decoder *dec, const void *val) +vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(struct vn_cs_decoder *dec, const void *val) { /* no known/supported struct */ if (vn_decode_simple_pointer(dec)) @@ -10730,7 +10730,7 @@ vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(struct vn_cs_decoder *dec } static inline void -vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_self(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR_self(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2FeaturesKHR *val) { /* skip val->{sType,pNext} */ vn_decode_VkBool32(dec, &val->robustBufferAccess2); @@ -10739,26 +10739,26 @@ vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_self(struct vn_cs_decoder *dec, } static inline void -vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2FeaturesKHR *val) { VkStructureType stype; vn_decode_VkStructureType(dec, &stype); - assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT); + assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR); assert(val->sType == stype); - vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext(dec, val->pNext); - vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_self(dec, val); + vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext(dec, val->pNext); + vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR_self(dec, val); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_pnext_partial(const void *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_pnext_partial(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial(const VkPhysicalDeviceRobustness2FeaturesKHR *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -10769,26 +10769,26 @@ vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(const VkPhysicalDe } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_partial(const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_partial(const VkPhysicalDeviceRobustness2FeaturesKHR *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_pnext_partial(val->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(val); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_pnext_partial(val->pNext); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial(val); return size; } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext_partial(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext_partial(struct vn_cs_encoder *enc, const void *val) { /* no known/supported struct */ vn_encode_simple_pointer(enc, NULL); } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesKHR *val) { /* skip val->{sType,pNext} */ /* skip val->robustBufferAccess2 */ @@ -10797,12 +10797,12 @@ vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(struct vn_cs_encod } static inline void -vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2FeaturesKHR *val) { - assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT }); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_pnext_partial(enc, val->pNext); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR }); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_pnext_partial(enc, val->pNext); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial(enc, val); } /* struct VkPhysicalDeviceImageRobustnessFeatures chain */ @@ -17267,13 +17267,13 @@ vn_sizeof_VkPhysicalDeviceFeatures2_pnext(const void *val) size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self((const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self((const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self((const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -18135,13 +18135,13 @@ vn_encode_VkPhysicalDeviceFeatures2_pnext(struct vn_cs_encoder *enc, const void vn_encode_VkPhysicalDeviceFeatures2_pnext(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self(enc, (const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkPhysicalDeviceFeatures2_pnext(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self(enc, (const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self(enc, (const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -18800,9 +18800,9 @@ vn_decode_VkPhysicalDeviceFeatures2_pnext(struct vn_cs_decoder *dec, const void vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); vn_decode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self(dec, (VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); break; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); - vn_decode_VkPhysicalDeviceRobustness2FeaturesEXT_self(dec, (VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + vn_decode_VkPhysicalDeviceRobustness2FeaturesKHR_self(dec, (VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); @@ -19479,13 +19479,13 @@ vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(const void *val) size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self_partial((const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial((const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial((const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -20347,13 +20347,13 @@ vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(struct vn_cs_encoder *enc, con vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self_partial(enc, (const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self_partial(enc, (const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self_partial(enc, (const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -21300,13 +21300,13 @@ vn_sizeof_VkDeviceCreateInfo_pnext(const void *val) size += vn_sizeof_VkDeviceCreateInfo_pnext(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self((const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkDeviceCreateInfo_pnext(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesEXT_self((const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + size += vn_sizeof_VkPhysicalDeviceRobustness2FeaturesKHR_self((const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -22221,13 +22221,13 @@ vn_encode_VkDeviceCreateInfo_pnext(struct vn_cs_encoder *enc, const void *val) vn_encode_VkDeviceCreateInfo_pnext(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR_self(enc, (const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkDeviceCreateInfo_pnext(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceRobustness2FeaturesEXT_self(enc, (const VkPhysicalDeviceRobustness2FeaturesEXT *)pnext); + vn_encode_VkPhysicalDeviceRobustness2FeaturesKHR_self(enc, (const VkPhysicalDeviceRobustness2FeaturesKHR *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: if (!vn_cs_renderer_protocol_has_extension(336 /* VK_EXT_image_robustness */)) @@ -27883,17 +27883,17 @@ vn_encode_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_partial(struct vn_c vn_encode_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_self_partial(enc, val); } -/* struct VkPhysicalDeviceRobustness2PropertiesEXT chain */ +/* struct VkPhysicalDeviceRobustness2PropertiesKHR chain */ static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_pnext(const void *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_pnext(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self(const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self(const VkPhysicalDeviceRobustness2PropertiesKHR *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -27903,19 +27903,19 @@ vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self(const VkPhysicalDeviceRo } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT(const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR(const VkPhysicalDeviceRobustness2PropertiesKHR *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_pnext(val->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self(val); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_pnext(val->pNext); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self(val); return size; } static inline void -vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_pnext(struct vn_cs_decoder *dec, const void *val) +vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR_pnext(struct vn_cs_decoder *dec, const void *val) { /* no known/supported struct */ if (vn_decode_simple_pointer(dec)) @@ -27923,7 +27923,7 @@ vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_pnext(struct vn_cs_decoder *d } static inline void -vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_self(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR_self(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2PropertiesKHR *val) { /* skip val->{sType,pNext} */ vn_decode_VkDeviceSize(dec, &val->robustStorageBufferAccessSizeAlignment); @@ -27931,26 +27931,26 @@ vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_self(struct vn_cs_decoder *de } static inline void -vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR(struct vn_cs_decoder *dec, VkPhysicalDeviceRobustness2PropertiesKHR *val) { VkStructureType stype; vn_decode_VkStructureType(dec, &stype); - assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT); + assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR); assert(val->sType == stype); - vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_pnext(dec, val->pNext); - vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_self(dec, val); + vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR_pnext(dec, val->pNext); + vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR_self(dec, val); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_pnext_partial(const void *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_pnext_partial(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial(const VkPhysicalDeviceRobustness2PropertiesKHR *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -27960,26 +27960,26 @@ vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(const VkPhysical } static inline size_t -vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_partial(const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_partial(const VkPhysicalDeviceRobustness2PropertiesKHR *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_pnext_partial(val->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(val); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_pnext_partial(val->pNext); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial(val); return size; } static inline void -vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_pnext_partial(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_pnext_partial(struct vn_cs_encoder *enc, const void *val) { /* no known/supported struct */ vn_encode_simple_pointer(enc, NULL); } static inline void -vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2PropertiesKHR *val) { /* skip val->{sType,pNext} */ /* skip val->robustStorageBufferAccessSizeAlignment */ @@ -27987,12 +27987,12 @@ vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(struct vn_cs_enc } static inline void -vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2PropertiesEXT *val) +vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceRobustness2PropertiesKHR *val) { - assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT }); - vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_pnext_partial(enc, val->pNext); - vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR }); + vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_pnext_partial(enc, val->pNext); + vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial(enc, val); } /* struct VkPhysicalDeviceFragmentShadingRatePropertiesKHR chain */ @@ -29499,13 +29499,13 @@ vn_sizeof_VkPhysicalDeviceProperties2_pnext(const void *val) size += vn_sizeof_VkPhysicalDeviceProperties2_pnext(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_self((const VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceProperties2_pnext(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self((const VkPhysicalDeviceRobustness2PropertiesEXT *)pnext); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self((const VkPhysicalDeviceRobustness2PropertiesKHR *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: if (!vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */)) @@ -29781,9 +29781,9 @@ vn_decode_VkPhysicalDeviceProperties2_pnext(struct vn_cs_decoder *dec, const voi vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext); vn_decode_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_self(dec, (VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *)pnext); break; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT: + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR: vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext); - vn_decode_VkPhysicalDeviceRobustness2PropertiesEXT_self(dec, (VkPhysicalDeviceRobustness2PropertiesEXT *)pnext); + vn_decode_VkPhysicalDeviceRobustness2PropertiesKHR_self(dec, (VkPhysicalDeviceRobustness2PropertiesKHR *)pnext); break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext); @@ -30130,13 +30130,13 @@ vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(const void *val) size += vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_self_partial((const VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial((const VkPhysicalDeviceRobustness2PropertiesEXT *)pnext); + size += vn_sizeof_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial((const VkPhysicalDeviceRobustness2PropertiesKHR *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: if (!vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */)) @@ -30524,13 +30524,13 @@ vn_encode_VkPhysicalDeviceProperties2_pnext_partial(struct vn_cs_encoder *enc, c vn_encode_VkPhysicalDeviceProperties2_pnext_partial(enc, pnext->pNext); vn_encode_VkPhysicalDeviceExtendedDynamicState3PropertiesEXT_self_partial(enc, (const VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT: - if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR: + if (!vn_cs_renderer_protocol_has_extension(287 /* VK_EXT_robustness2 */) && !vn_cs_renderer_protocol_has_extension(613 /* VK_KHR_robustness2 */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkPhysicalDeviceProperties2_pnext_partial(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceRobustness2PropertiesEXT_self_partial(enc, (const VkPhysicalDeviceRobustness2PropertiesEXT *)pnext); + vn_encode_VkPhysicalDeviceRobustness2PropertiesKHR_self_partial(enc, (const VkPhysicalDeviceRobustness2PropertiesKHR *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: if (!vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */)) diff --git a/src/virtio/venus-protocol/vn_protocol_driver_info.h b/src/virtio/venus-protocol/vn_protocol_driver_info.h index 74f8f0eb42b..db6a8353799 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_info.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_info.h @@ -10,7 +10,7 @@ #include "vn_protocol_driver_defines.h" -#define VN_INFO_EXTENSION_MAX_NUMBER (605) +#define VN_INFO_EXTENSION_MAX_NUMBER (613) struct vn_info_extension { const char *name; @@ -19,8 +19,8 @@ struct vn_info_extension { }; /* sorted by extension names for bsearch */ -static const uint32_t _vn_info_extension_count = 178; -static const struct vn_info_extension _vn_info_extensions[178] = { +static const uint32_t _vn_info_extension_count = 179; +static const struct vn_info_extension _vn_info_extensions[179] = { { "VK_ARM_rasterization_order_attachment_access", 343, 1 }, { "VK_EXT_4444_formats", 341, 1 }, { "VK_EXT_attachment_feedback_loop_dynamic_state", 525, 1 }, @@ -167,6 +167,7 @@ static const struct vn_info_extension _vn_info_extensions[178] = { { "VK_KHR_ray_tracing_pipeline", 348, 1 }, { "VK_KHR_ray_tracing_position_fetch", 482, 1 }, { "VK_KHR_relaxed_block_layout", 145, 1 }, + { "VK_KHR_robustness2", 613, 1 }, { "VK_KHR_sampler_mirror_clamp_to_edge", 15, 3 }, { "VK_KHR_sampler_ycbcr_conversion", 157, 14 }, { "VK_KHR_separate_depth_stencil_layouts", 242, 1 }, @@ -210,7 +211,7 @@ vn_info_wire_format_version(void) static inline uint32_t vn_info_vk_xml_version(void) { - return VK_MAKE_API_VERSION(0, 1, 4, 307); + return VK_MAKE_API_VERSION(0, 1, 4, 334); } static inline int diff --git a/src/virtio/venus-protocol/vn_protocol_driver_types.h b/src/virtio/venus-protocol/vn_protocol_driver_types.h index dc5dddfc7c2..3ff607dfcb8 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_types.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_types.h @@ -673,6 +673,27 @@ vn_decode_VkFramebufferCreateFlagBits(struct vn_cs_decoder *dec, VkFramebufferCr vn_decode_int32_t(dec, (int32_t *)val); } +/* enum VkQueryPoolCreateFlagBits */ + +static inline size_t +vn_sizeof_VkQueryPoolCreateFlagBits(const VkQueryPoolCreateFlagBits *val) +{ + assert(sizeof(*val) == sizeof(int32_t)); + return vn_sizeof_int32_t((const int32_t *)val); +} + +static inline void +vn_encode_VkQueryPoolCreateFlagBits(struct vn_cs_encoder *enc, const VkQueryPoolCreateFlagBits *val) +{ + vn_encode_int32_t(enc, (const int32_t *)val); +} + +static inline void +vn_decode_VkQueryPoolCreateFlagBits(struct vn_cs_decoder *dec, VkQueryPoolCreateFlagBits *val) +{ + vn_decode_int32_t(dec, (int32_t *)val); +} + /* enum VkRenderPassCreateFlagBits */ static inline size_t