diff --git a/src/virtio/venus-protocol/vn_protocol_driver.h b/src/virtio/venus-protocol/vn_protocol_driver.h index cfcfef58ca9..7bcb9eacba8 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-028d2c84. */ +/* This file is generated by venus-protocol git-3717cd34. */ /* * Copyright 2020 Google LLC diff --git a/src/virtio/venus-protocol/vn_protocol_driver_buffer.h b/src/virtio/venus-protocol/vn_protocol_driver_buffer.h index 817f73698d0..88f16b8d71b 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_buffer.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_buffer.h @@ -167,7 +167,7 @@ vn_sizeof_VkBufferCreateInfo_self(const VkBufferCreateInfo *val) size += vn_sizeof_VkFlags(&val->usage); size += vn_sizeof_VkSharingMode(&val->sharingMode); size += vn_sizeof_uint32_t(&val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { size += vn_sizeof_array_size(val->queueFamilyIndexCount); size += vn_sizeof_uint32_t_array(val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else { @@ -234,7 +234,7 @@ vn_encode_VkBufferCreateInfo_self(struct vn_cs_encoder *enc, const VkBufferCreat vn_encode_VkFlags(enc, &val->usage); vn_encode_VkSharingMode(enc, &val->sharingMode); vn_encode_uint32_t(enc, &val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { vn_encode_array_size(enc, val->queueFamilyIndexCount); vn_encode_uint32_t_array(enc, val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else { diff --git a/src/virtio/venus-protocol/vn_protocol_driver_device.h b/src/virtio/venus-protocol/vn_protocol_driver_device.h index ab5697588e2..8cd937f44df 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_device.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_device.h @@ -21457,7 +21457,7 @@ vn_sizeof_VkPhysicalDeviceImageDrmFormatModifierInfoEXT_self(const VkPhysicalDev size += vn_sizeof_uint64_t(&val->drmFormatModifier); size += vn_sizeof_VkSharingMode(&val->sharingMode); size += vn_sizeof_uint32_t(&val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { size += vn_sizeof_array_size(val->queueFamilyIndexCount); size += vn_sizeof_uint32_t_array(val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else { @@ -21492,7 +21492,7 @@ vn_encode_VkPhysicalDeviceImageDrmFormatModifierInfoEXT_self(struct vn_cs_encode vn_encode_uint64_t(enc, &val->drmFormatModifier); vn_encode_VkSharingMode(enc, &val->sharingMode); vn_encode_uint32_t(enc, &val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { vn_encode_array_size(enc, val->queueFamilyIndexCount); vn_encode_uint32_t_array(enc, val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else { diff --git a/src/virtio/venus-protocol/vn_protocol_driver_framebuffer.h b/src/virtio/venus-protocol/vn_protocol_driver_framebuffer.h index 8238386dbfe..92b0a395c58 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_framebuffer.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_framebuffer.h @@ -187,7 +187,7 @@ vn_sizeof_VkFramebufferCreateInfo_self(const VkFramebufferCreateInfo *val) size += vn_sizeof_VkFlags(&val->flags); size += vn_sizeof_VkRenderPass(&val->renderPass); size += vn_sizeof_uint32_t(&val->attachmentCount); - if (val->pAttachments) { + if (!(val->flags & VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT)) { size += vn_sizeof_array_size(val->attachmentCount); for (uint32_t i = 0; i < val->attachmentCount; i++) size += vn_sizeof_VkImageView(&val->pAttachments[i]); @@ -242,7 +242,7 @@ vn_encode_VkFramebufferCreateInfo_self(struct vn_cs_encoder *enc, const VkFrameb vn_encode_VkFlags(enc, &val->flags); vn_encode_VkRenderPass(enc, &val->renderPass); vn_encode_uint32_t(enc, &val->attachmentCount); - if (val->pAttachments) { + if (!(val->flags & VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT)) { vn_encode_array_size(enc, val->attachmentCount); for (uint32_t i = 0; i < val->attachmentCount; i++) vn_encode_VkImageView(enc, &val->pAttachments[i]); diff --git a/src/virtio/venus-protocol/vn_protocol_driver_image.h b/src/virtio/venus-protocol/vn_protocol_driver_image.h index a885278458a..9ab1a39716c 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_image.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_image.h @@ -370,7 +370,7 @@ vn_sizeof_VkImageCreateInfo_self(const VkImageCreateInfo *val) size += vn_sizeof_VkFlags(&val->usage); size += vn_sizeof_VkSharingMode(&val->sharingMode); size += vn_sizeof_uint32_t(&val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { size += vn_sizeof_array_size(val->queueFamilyIndexCount); size += vn_sizeof_uint32_t_array(val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else { @@ -458,7 +458,7 @@ vn_encode_VkImageCreateInfo_self(struct vn_cs_encoder *enc, const VkImageCreateI vn_encode_VkFlags(enc, &val->usage); vn_encode_VkSharingMode(enc, &val->sharingMode); vn_encode_uint32_t(enc, &val->queueFamilyIndexCount); - if (val->pQueueFamilyIndices) { + if (val->sharingMode == VK_SHARING_MODE_CONCURRENT) { vn_encode_array_size(enc, val->queueFamilyIndexCount); vn_encode_uint32_t_array(enc, val->pQueueFamilyIndices, val->queueFamilyIndexCount); } else {