From 0737ad8f8668dbc5338ac633b7ebdd639ebe1179 Mon Sep 17 00:00:00 2001 From: Dawn Han Date: Tue, 20 Sep 2022 01:22:51 +0000 Subject: [PATCH] venus: support the promoted VK_EXT_mutable_descriptor_type Signed-off-by: Dawn Han Part-of: --- .../venus-protocol/vn_protocol_driver.h | 2 +- .../vn_protocol_driver_descriptor_pool.h | 12 +-- ...vn_protocol_driver_descriptor_set_layout.h | 12 +-- .../vn_protocol_driver_device.h | 102 +++++++++--------- .../venus-protocol/vn_protocol_driver_info.h | 9 +- .../vn_protocol_driver_structs.h | 36 +++---- 6 files changed, 87 insertions(+), 86 deletions(-) diff --git a/src/virtio/venus-protocol/vn_protocol_driver.h b/src/virtio/venus-protocol/vn_protocol_driver.h index b23ae3541cc..8124d346da0 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-0d1b7e59. */ +/* This file is generated by venus-protocol git-cca9a548. */ /* * Copyright 2020 Google LLC diff --git a/src/virtio/venus-protocol/vn_protocol_driver_descriptor_pool.h b/src/virtio/venus-protocol/vn_protocol_driver_descriptor_pool.h index 158f4482dd9..ffa6f7f67d9 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_descriptor_pool.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_descriptor_pool.h @@ -100,13 +100,13 @@ vn_sizeof_VkDescriptorPoolCreateInfo_pnext(const void *val) size += vn_sizeof_VkDescriptorPoolCreateInfo_pnext(pnext->pNext); size += vn_sizeof_VkDescriptorPoolInlineUniformBlockCreateInfo_self((const VkDescriptorPoolInlineUniformBlockCreateInfo *)pnext); return size; - case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkDescriptorPoolCreateInfo_pnext(pnext->pNext); - size += vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self((const VkMutableDescriptorTypeCreateInfoVALVE *)pnext); + size += vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_self((const VkMutableDescriptorTypeCreateInfoEXT *)pnext); return size; default: /* ignore unknown/unsupported struct */ @@ -163,13 +163,13 @@ vn_encode_VkDescriptorPoolCreateInfo_pnext(struct vn_cs_encoder *enc, const void vn_encode_VkDescriptorPoolCreateInfo_pnext(enc, pnext->pNext); vn_encode_VkDescriptorPoolInlineUniformBlockCreateInfo_self(enc, (const VkDescriptorPoolInlineUniformBlockCreateInfo *)pnext); return; - case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkDescriptorPoolCreateInfo_pnext(enc, pnext->pNext); - vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_self(enc, (const VkMutableDescriptorTypeCreateInfoVALVE *)pnext); + vn_encode_VkMutableDescriptorTypeCreateInfoEXT_self(enc, (const VkMutableDescriptorTypeCreateInfoEXT *)pnext); return; default: /* ignore unknown/unsupported struct */ diff --git a/src/virtio/venus-protocol/vn_protocol_driver_descriptor_set_layout.h b/src/virtio/venus-protocol/vn_protocol_driver_descriptor_set_layout.h index 228af3d12ee..e3ab16d9078 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_descriptor_set_layout.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_descriptor_set_layout.h @@ -130,13 +130,13 @@ vn_sizeof_VkDescriptorSetLayoutCreateInfo_pnext(const void *val) size += vn_sizeof_VkDescriptorSetLayoutCreateInfo_pnext(pnext->pNext); size += vn_sizeof_VkDescriptorSetLayoutBindingFlagsCreateInfo_self((const VkDescriptorSetLayoutBindingFlagsCreateInfo *)pnext); return size; - case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkDescriptorSetLayoutCreateInfo_pnext(pnext->pNext); - size += vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self((const VkMutableDescriptorTypeCreateInfoVALVE *)pnext); + size += vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_self((const VkMutableDescriptorTypeCreateInfoEXT *)pnext); return size; default: /* ignore unknown/unsupported struct */ @@ -190,13 +190,13 @@ vn_encode_VkDescriptorSetLayoutCreateInfo_pnext(struct vn_cs_encoder *enc, const vn_encode_VkDescriptorSetLayoutCreateInfo_pnext(enc, pnext->pNext); vn_encode_VkDescriptorSetLayoutBindingFlagsCreateInfo_self(enc, (const VkDescriptorSetLayoutBindingFlagsCreateInfo *)pnext); return; - case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkDescriptorSetLayoutCreateInfo_pnext(enc, pnext->pNext); - vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_self(enc, (const VkMutableDescriptorTypeCreateInfoVALVE *)pnext); + vn_encode_VkMutableDescriptorTypeCreateInfoEXT_self(enc, (const VkMutableDescriptorTypeCreateInfoEXT *)pnext); return; default: /* ignore unknown/unsupported struct */ diff --git a/src/virtio/venus-protocol/vn_protocol_driver_device.h b/src/virtio/venus-protocol/vn_protocol_driver_device.h index a8eacb53ea7..a8eb9cd9451 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_device.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_device.h @@ -7922,17 +7922,17 @@ vn_encode_VkPhysicalDeviceShaderTerminateInvocationFeatures_partial(struct vn_cs vn_encode_VkPhysicalDeviceShaderTerminateInvocationFeatures_self_partial(enc, val); } -/* struct VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE chain */ +/* struct VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT chain */ static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(const void *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -7941,42 +7941,42 @@ vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(const VkPhysic } static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE(const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT(const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(val->pNext); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(val); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(val->pNext); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(val); return size; } static inline void -vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(struct vn_cs_encoder *enc, const void *val) { /* no known/supported struct */ vn_encode_simple_pointer(enc, NULL); } static inline void -vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { /* skip val->{sType,pNext} */ vn_encode_VkBool32(enc, &val->mutableDescriptorType); } static inline void -vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { - assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE }); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(enc, val->pNext); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT }); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(enc, val->pNext); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(enc, val); } static inline void -vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(struct vn_cs_decoder *dec, const void *val) +vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(struct vn_cs_decoder *dec, const void *val) { /* no known/supported struct */ if (vn_decode_simple_pointer(dec)) @@ -7984,33 +7984,33 @@ vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(struct vn_cs_ } static inline void -vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(struct vn_cs_decoder *dec, VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(struct vn_cs_decoder *dec, VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { /* skip val->{sType,pNext} */ vn_decode_VkBool32(dec, &val->mutableDescriptorType); } static inline void -vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE(struct vn_cs_decoder *dec, VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT(struct vn_cs_decoder *dec, VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { VkStructureType stype; vn_decode_VkStructureType(dec, &stype); - assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE); + assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT); assert(val->sType == stype); - vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext(dec, val->pNext); - vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(dec, val); + vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext(dec, val->pNext); + vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(dec, val); } static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext_partial(const void *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext_partial(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial(const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -8019,38 +8019,38 @@ vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(const } static inline size_t -vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_partial(const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_partial(const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext_partial(val->pNext); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(val); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext_partial(val->pNext); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial(val); return size; } static inline void -vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext_partial(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_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_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { /* skip val->{sType,pNext} */ /* skip val->mutableDescriptorType */ } static inline void -vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *val) +vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_partial(struct vn_cs_encoder *enc, const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *val) { - assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE }); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_pnext_partial(enc, val->pNext); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT }); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_pnext_partial(enc, val->pNext); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial(enc, val); } /* struct VkPhysicalDeviceSynchronization2Features chain */ @@ -9180,13 +9180,13 @@ vn_sizeof_VkPhysicalDeviceFeatures2_pnext(const void *val) size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderTerminateInvocationFeatures_self((const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self((const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self((const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) @@ -9600,13 +9600,13 @@ vn_encode_VkPhysicalDeviceFeatures2_pnext(struct vn_cs_encoder *enc, const void vn_encode_VkPhysicalDeviceFeatures2_pnext(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderTerminateInvocationFeatures_self(enc, (const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkPhysicalDeviceFeatures2_pnext(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) @@ -9885,9 +9885,9 @@ vn_decode_VkPhysicalDeviceFeatures2_pnext(struct vn_cs_decoder *dec, const void vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); vn_decode_VkPhysicalDeviceShaderTerminateInvocationFeatures_self(dec, (VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); break; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); - vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(dec, (VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + vn_decode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(dec, (VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: vn_decode_VkPhysicalDeviceFeatures2_pnext(dec, pnext->pNext); @@ -10272,13 +10272,13 @@ vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(const void *val) size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderTerminateInvocationFeatures_self_partial((const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkPhysicalDeviceFeatures2_pnext_partial(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial((const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial((const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) @@ -10692,13 +10692,13 @@ vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(struct vn_cs_encoder *enc, con vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderTerminateInvocationFeatures_self_partial(enc, (const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkPhysicalDeviceFeatures2_pnext_partial(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self_partial(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self_partial(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) @@ -11197,13 +11197,13 @@ vn_sizeof_VkDeviceCreateInfo_pnext(const void *val) size += vn_sizeof_VkDeviceCreateInfo_pnext(pnext->pNext); size += vn_sizeof_VkPhysicalDeviceShaderTerminateInvocationFeatures_self((const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return size; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; size += vn_sizeof_simple_pointer(pnext); size += vn_sizeof_VkStructureType(&pnext->sType); size += vn_sizeof_VkDeviceCreateInfo_pnext(pnext->pNext); - size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self((const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + size += vn_sizeof_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self((const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return size; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) @@ -11670,13 +11670,13 @@ vn_encode_VkDeviceCreateInfo_pnext(struct vn_cs_encoder *enc, const void *val) vn_encode_VkDeviceCreateInfo_pnext(enc, pnext->pNext); vn_encode_VkPhysicalDeviceShaderTerminateInvocationFeatures_self(enc, (const VkPhysicalDeviceShaderTerminateInvocationFeatures *)pnext); return; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: - if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */)) + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT: + if (!vn_cs_renderer_protocol_has_extension(352 /* VK_VALVE_mutable_descriptor_type */) && !vn_cs_renderer_protocol_has_extension(495 /* VK_EXT_mutable_descriptor_type */)) break; vn_encode_simple_pointer(enc, pnext); vn_encode_VkStructureType(enc, &pnext->sType); vn_encode_VkDeviceCreateInfo_pnext(enc, pnext->pNext); - vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE_self(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)pnext); + vn_encode_VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT_self(enc, (const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *)pnext); return; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: if (!vn_cs_renderer_protocol_has_extension(315 /* VK_KHR_synchronization2 */)) diff --git a/src/virtio/venus-protocol/vn_protocol_driver_info.h b/src/virtio/venus-protocol/vn_protocol_driver_info.h index b6b023ffe2e..97771c81af8 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 (414) +#define VN_INFO_EXTENSION_MAX_NUMBER (495) 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 = 94; -static const struct vn_info_extension _vn_info_extensions[94] = { +static const uint32_t _vn_info_extension_count = 95; +static const struct vn_info_extension _vn_info_extensions[95] = { { "VK_EXT_4444_formats", 341, 1 }, { "VK_EXT_calibrated_timestamps", 185, 2 }, { "VK_EXT_command_serialization", 384, 0 }, @@ -40,6 +40,7 @@ static const struct vn_info_extension _vn_info_extensions[94] = { { "VK_EXT_inline_uniform_block", 139, 1 }, { "VK_EXT_line_rasterization", 260, 1 }, { "VK_EXT_multi_draw", 393, 1 }, + { "VK_EXT_mutable_descriptor_type", 495, 1 }, { "VK_EXT_pipeline_creation_cache_control", 298, 3 }, { "VK_EXT_pipeline_creation_feedback", 193, 1 }, { "VK_EXT_primitive_topology_list_restart", 357, 1 }, @@ -126,7 +127,7 @@ vn_info_wire_format_version(void) static inline uint32_t vn_info_vk_xml_version(void) { - return VK_MAKE_API_VERSION(0, 1, 3, 227); + return VK_MAKE_API_VERSION(0, 1, 3, 228); } static inline int diff --git a/src/virtio/venus-protocol/vn_protocol_driver_structs.h b/src/virtio/venus-protocol/vn_protocol_driver_structs.h index 4b9d6f1ef37..73553f1ee53 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_structs.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_structs.h @@ -852,10 +852,10 @@ vn_encode_VkClearColorValue(struct vn_cs_encoder *enc, const VkClearColorValue * vn_encode_VkClearColorValue_tag(enc, val, 2); /* union with default tag */ } -/* struct VkMutableDescriptorTypeListVALVE */ +/* struct VkMutableDescriptorTypeListEXT */ static inline size_t -vn_sizeof_VkMutableDescriptorTypeListVALVE(const VkMutableDescriptorTypeListVALVE *val) +vn_sizeof_VkMutableDescriptorTypeListEXT(const VkMutableDescriptorTypeListEXT *val) { size_t size = 0; size += vn_sizeof_uint32_t(&val->descriptorTypeCount); @@ -869,7 +869,7 @@ vn_sizeof_VkMutableDescriptorTypeListVALVE(const VkMutableDescriptorTypeListVALV } static inline void -vn_encode_VkMutableDescriptorTypeListVALVE(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeListVALVE *val) +vn_encode_VkMutableDescriptorTypeListEXT(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeListEXT *val) { vn_encode_uint32_t(enc, &val->descriptorTypeCount); if (val->pDescriptorTypes) { @@ -880,17 +880,17 @@ vn_encode_VkMutableDescriptorTypeListVALVE(struct vn_cs_encoder *enc, const VkMu } } -/* struct VkMutableDescriptorTypeCreateInfoVALVE chain */ +/* struct VkMutableDescriptorTypeCreateInfoEXT chain */ static inline size_t -vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_pnext(const void *val) +vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_pnext(const void *val) { /* no known/supported struct */ return vn_sizeof_simple_pointer(NULL); } static inline size_t -vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self(const VkMutableDescriptorTypeCreateInfoVALVE *val) +vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_self(const VkMutableDescriptorTypeCreateInfoEXT *val) { size_t size = 0; /* skip val->{sType,pNext} */ @@ -898,7 +898,7 @@ vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self(const VkMutableDescriptorT if (val->pMutableDescriptorTypeLists) { size += vn_sizeof_array_size(val->mutableDescriptorTypeListCount); for (uint32_t i = 0; i < val->mutableDescriptorTypeListCount; i++) - size += vn_sizeof_VkMutableDescriptorTypeListVALVE(&val->pMutableDescriptorTypeLists[i]); + size += vn_sizeof_VkMutableDescriptorTypeListEXT(&val->pMutableDescriptorTypeLists[i]); } else { size += vn_sizeof_array_size(0); } @@ -906,45 +906,45 @@ vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self(const VkMutableDescriptorT } static inline size_t -vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE(const VkMutableDescriptorTypeCreateInfoVALVE *val) +vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT(const VkMutableDescriptorTypeCreateInfoEXT *val) { size_t size = 0; size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_pnext(val->pNext); - size += vn_sizeof_VkMutableDescriptorTypeCreateInfoVALVE_self(val); + size += vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_pnext(val->pNext); + size += vn_sizeof_VkMutableDescriptorTypeCreateInfoEXT_self(val); return size; } static inline void -vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_pnext(struct vn_cs_encoder *enc, const void *val) +vn_encode_VkMutableDescriptorTypeCreateInfoEXT_pnext(struct vn_cs_encoder *enc, const void *val) { /* no known/supported struct */ vn_encode_simple_pointer(enc, NULL); } static inline void -vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_self(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeCreateInfoVALVE *val) +vn_encode_VkMutableDescriptorTypeCreateInfoEXT_self(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeCreateInfoEXT *val) { /* skip val->{sType,pNext} */ vn_encode_uint32_t(enc, &val->mutableDescriptorTypeListCount); if (val->pMutableDescriptorTypeLists) { vn_encode_array_size(enc, val->mutableDescriptorTypeListCount); for (uint32_t i = 0; i < val->mutableDescriptorTypeListCount; i++) - vn_encode_VkMutableDescriptorTypeListVALVE(enc, &val->pMutableDescriptorTypeLists[i]); + vn_encode_VkMutableDescriptorTypeListEXT(enc, &val->pMutableDescriptorTypeLists[i]); } else { vn_encode_array_size(enc, 0); } } static inline void -vn_encode_VkMutableDescriptorTypeCreateInfoVALVE(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeCreateInfoVALVE *val) +vn_encode_VkMutableDescriptorTypeCreateInfoEXT(struct vn_cs_encoder *enc, const VkMutableDescriptorTypeCreateInfoEXT *val) { - assert(val->sType == VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE }); - vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_pnext(enc, val->pNext); - vn_encode_VkMutableDescriptorTypeCreateInfoVALVE_self(enc, val); + assert(val->sType == VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT }); + vn_encode_VkMutableDescriptorTypeCreateInfoEXT_pnext(enc, val->pNext); + vn_encode_VkMutableDescriptorTypeCreateInfoEXT_self(enc, val); } /* struct VkMemoryDedicatedRequirements chain */