From 2eb5a75d5156ca3c713b064e44620ef0b6382554 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 24 Feb 2025 16:37:06 -0800 Subject: [PATCH] venus: sync latest protocol v3 support for host copy Signed-off-by: Yiwei Zhang Part-of: --- .../venus-protocol/vn_protocol_driver.h | 3 +- .../vn_protocol_driver_defines.h | 52 +- .../vn_protocol_driver_host_copy.h | 788 ++++++++++++++++++ .../venus-protocol/vn_protocol_driver_image.h | 348 -------- .../venus-protocol/vn_protocol_driver_info.h | 2 +- 5 files changed, 837 insertions(+), 356 deletions(-) create mode 100644 src/virtio/venus-protocol/vn_protocol_driver_host_copy.h diff --git a/src/virtio/venus-protocol/vn_protocol_driver.h b/src/virtio/venus-protocol/vn_protocol_driver.h index 24ed5631181..3a68199456c 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-de61e4ea. */ +/* This file is generated by venus-protocol git-6dd3cf86. */ /* * Copyright 2020 Google LLC @@ -42,5 +42,6 @@ #include "vn_protocol_driver_command_pool.h" #include "vn_protocol_driver_command_buffer.h" #include "vn_protocol_driver_private_data_slot.h" +#include "vn_protocol_driver_host_copy.h" #endif /* VN_PROTOCOL_DRIVER_H */ diff --git a/src/virtio/venus-protocol/vn_protocol_driver_defines.h b/src/virtio/venus-protocol/vn_protocol_driver_defines.h index 7be22791173..1dd29b87a4e 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_defines.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_defines.h @@ -23,6 +23,9 @@ #define VK_STRUCTURE_TYPE_DEVICE_QUEUE_TIMELINE_INFO_MESA ((VkStructureType)1000384005) #define VK_STRUCTURE_TYPE_RING_MONITOR_INFO_MESA ((VkStructureType)1000384006) #define VK_STRUCTURE_TYPE_RING_PRIORITY_INFO_MESA ((VkStructureType)1000384007) +#define VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_MESA ((VkStructureType)1000384008) +#define VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_MESA ((VkStructureType)1000384009) +#define VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_MESA ((VkStructureType)1000384010) typedef enum VkCommandTypeEXT { VK_COMMAND_TYPE_vkCreateInstance_EXT = 0, @@ -423,6 +426,8 @@ typedef enum VkCommandTypeEXT { VK_COMMAND_TYPE_vkSubmitVirtqueueSeqnoMESA_EXT = 251, VK_COMMAND_TYPE_vkWaitVirtqueueSeqnoMESA_EXT = 252, VK_COMMAND_TYPE_vkWaitRingSeqnoMESA_EXT = 253, + VK_COMMAND_TYPE_vkCopyImageToMemoryMESA_EXT = 297, + VK_COMMAND_TYPE_vkCopyMemoryToImageMESA_EXT = 298, } VkCommandTypeEXT; typedef enum VkCommandFlagBitsEXT { @@ -480,12 +485,6 @@ typedef struct VkRingMonitorInfoMESA { uint32_t maxReportingPeriodMicroseconds; } VkRingMonitorInfoMESA; -typedef struct VkRingPriorityInfoMESA { - VkStructureType sType; - const void* pNext; - int32_t priority; -} VkRingPriorityInfoMESA; - typedef struct VkMemoryResourcePropertiesMESA { VkStructureType sType; void* pNext; @@ -517,4 +516,45 @@ typedef struct VkDeviceQueueTimelineInfoMESA { uint32_t ringIdx; } VkDeviceQueueTimelineInfoMESA; +typedef struct VkRingPriorityInfoMESA { + VkStructureType sType; + const void* pNext; + int32_t priority; +} VkRingPriorityInfoMESA; + +typedef struct VkCopyImageToMemoryInfoMESA { + VkStructureType sType; + const void* pNext; + VkHostImageCopyFlags flags; + VkImage srcImage; + VkImageLayout srcImageLayout; + uint32_t memoryRowLength; + uint32_t memoryImageHeight; + VkImageSubresourceLayers imageSubresource; + VkOffset3D imageOffset; + VkExtent3D imageExtent; +} VkCopyImageToMemoryInfoMESA; + +typedef struct VkMemoryToImageCopyMESA { + VkStructureType sType; + const void* pNext; + size_t dataSize; + const void* pData; + uint32_t memoryRowLength; + uint32_t memoryImageHeight; + VkImageSubresourceLayers imageSubresource; + VkOffset3D imageOffset; + VkExtent3D imageExtent; +} VkMemoryToImageCopyMESA; + +typedef struct VkCopyMemoryToImageInfoMESA { + VkStructureType sType; + const void* pNext; + VkHostImageCopyFlags flags; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkMemoryToImageCopyMESA* pRegions; +} VkCopyMemoryToImageInfoMESA; + #endif /* VN_PROTOCOL_DRIVER_DEFINES_H */ diff --git a/src/virtio/venus-protocol/vn_protocol_driver_host_copy.h b/src/virtio/venus-protocol/vn_protocol_driver_host_copy.h new file mode 100644 index 00000000000..3c01d12e39b --- /dev/null +++ b/src/virtio/venus-protocol/vn_protocol_driver_host_copy.h @@ -0,0 +1,788 @@ +/* This file is generated by venus-protocol. See vn_protocol_driver.h. */ + +/* + * Copyright 2020 Google LLC + * SPDX-License-Identifier: MIT + */ + +#ifndef VN_PROTOCOL_DRIVER_HOST_COPY_H +#define VN_PROTOCOL_DRIVER_HOST_COPY_H + +#include "vn_ring.h" +#include "vn_protocol_driver_structs.h" + +/* + * These structs/unions/commands are not included + * + * vkCopyMemoryToImage + * vkCopyImageToMemory + */ + +/* struct VkCopyImageToImageInfo chain */ + +static inline size_t +vn_sizeof_VkCopyImageToImageInfo_pnext(const void *val) +{ + /* no known/supported struct */ + return vn_sizeof_simple_pointer(NULL); +} + +static inline size_t +vn_sizeof_VkCopyImageToImageInfo_self(const VkCopyImageToImageInfo *val) +{ + size_t size = 0; + /* skip val->{sType,pNext} */ + size += vn_sizeof_VkFlags(&val->flags); + size += vn_sizeof_VkImage(&val->srcImage); + size += vn_sizeof_VkImageLayout(&val->srcImageLayout); + size += vn_sizeof_VkImage(&val->dstImage); + size += vn_sizeof_VkImageLayout(&val->dstImageLayout); + size += vn_sizeof_uint32_t(&val->regionCount); + if (val->pRegions) { + size += vn_sizeof_array_size(val->regionCount); + for (uint32_t i = 0; i < val->regionCount; i++) + size += vn_sizeof_VkImageCopy2(&val->pRegions[i]); + } else { + size += vn_sizeof_array_size(0); + } + return size; +} + +static inline size_t +vn_sizeof_VkCopyImageToImageInfo(const VkCopyImageToImageInfo *val) +{ + size_t size = 0; + + size += vn_sizeof_VkStructureType(&val->sType); + size += vn_sizeof_VkCopyImageToImageInfo_pnext(val->pNext); + size += vn_sizeof_VkCopyImageToImageInfo_self(val); + + return size; +} + +static inline void +vn_encode_VkCopyImageToImageInfo_pnext(struct vn_cs_encoder *enc, const void *val) +{ + /* no known/supported struct */ + vn_encode_simple_pointer(enc, NULL); +} + +static inline void +vn_encode_VkCopyImageToImageInfo_self(struct vn_cs_encoder *enc, const VkCopyImageToImageInfo *val) +{ + /* skip val->{sType,pNext} */ + vn_encode_VkFlags(enc, &val->flags); + vn_encode_VkImage(enc, &val->srcImage); + vn_encode_VkImageLayout(enc, &val->srcImageLayout); + vn_encode_VkImage(enc, &val->dstImage); + vn_encode_VkImageLayout(enc, &val->dstImageLayout); + vn_encode_uint32_t(enc, &val->regionCount); + if (val->pRegions) { + vn_encode_array_size(enc, val->regionCount); + for (uint32_t i = 0; i < val->regionCount; i++) + vn_encode_VkImageCopy2(enc, &val->pRegions[i]); + } else { + vn_encode_array_size(enc, 0); + } +} + +static inline void +vn_encode_VkCopyImageToImageInfo(struct vn_cs_encoder *enc, const VkCopyImageToImageInfo *val) +{ + assert(val->sType == VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO }); + vn_encode_VkCopyImageToImageInfo_pnext(enc, val->pNext); + vn_encode_VkCopyImageToImageInfo_self(enc, val); +} + +/* struct VkHostImageLayoutTransitionInfo chain */ + +static inline size_t +vn_sizeof_VkHostImageLayoutTransitionInfo_pnext(const void *val) +{ + /* no known/supported struct */ + return vn_sizeof_simple_pointer(NULL); +} + +static inline size_t +vn_sizeof_VkHostImageLayoutTransitionInfo_self(const VkHostImageLayoutTransitionInfo *val) +{ + size_t size = 0; + /* skip val->{sType,pNext} */ + size += vn_sizeof_VkImage(&val->image); + size += vn_sizeof_VkImageLayout(&val->oldLayout); + size += vn_sizeof_VkImageLayout(&val->newLayout); + size += vn_sizeof_VkImageSubresourceRange(&val->subresourceRange); + return size; +} + +static inline size_t +vn_sizeof_VkHostImageLayoutTransitionInfo(const VkHostImageLayoutTransitionInfo *val) +{ + size_t size = 0; + + size += vn_sizeof_VkStructureType(&val->sType); + size += vn_sizeof_VkHostImageLayoutTransitionInfo_pnext(val->pNext); + size += vn_sizeof_VkHostImageLayoutTransitionInfo_self(val); + + return size; +} + +static inline void +vn_encode_VkHostImageLayoutTransitionInfo_pnext(struct vn_cs_encoder *enc, const void *val) +{ + /* no known/supported struct */ + vn_encode_simple_pointer(enc, NULL); +} + +static inline void +vn_encode_VkHostImageLayoutTransitionInfo_self(struct vn_cs_encoder *enc, const VkHostImageLayoutTransitionInfo *val) +{ + /* skip val->{sType,pNext} */ + vn_encode_VkImage(enc, &val->image); + vn_encode_VkImageLayout(enc, &val->oldLayout); + vn_encode_VkImageLayout(enc, &val->newLayout); + vn_encode_VkImageSubresourceRange(enc, &val->subresourceRange); +} + +static inline void +vn_encode_VkHostImageLayoutTransitionInfo(struct vn_cs_encoder *enc, const VkHostImageLayoutTransitionInfo *val) +{ + assert(val->sType == VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO }); + vn_encode_VkHostImageLayoutTransitionInfo_pnext(enc, val->pNext); + vn_encode_VkHostImageLayoutTransitionInfo_self(enc, val); +} + +/* struct VkCopyImageToMemoryInfoMESA chain */ + +static inline size_t +vn_sizeof_VkCopyImageToMemoryInfoMESA_pnext(const void *val) +{ + /* no known/supported struct */ + return vn_sizeof_simple_pointer(NULL); +} + +static inline size_t +vn_sizeof_VkCopyImageToMemoryInfoMESA_self(const VkCopyImageToMemoryInfoMESA *val) +{ + size_t size = 0; + /* skip val->{sType,pNext} */ + size += vn_sizeof_VkFlags(&val->flags); + size += vn_sizeof_VkImage(&val->srcImage); + size += vn_sizeof_VkImageLayout(&val->srcImageLayout); + size += vn_sizeof_uint32_t(&val->memoryRowLength); + size += vn_sizeof_uint32_t(&val->memoryImageHeight); + size += vn_sizeof_VkImageSubresourceLayers(&val->imageSubresource); + size += vn_sizeof_VkOffset3D(&val->imageOffset); + size += vn_sizeof_VkExtent3D(&val->imageExtent); + return size; +} + +static inline size_t +vn_sizeof_VkCopyImageToMemoryInfoMESA(const VkCopyImageToMemoryInfoMESA *val) +{ + size_t size = 0; + + size += vn_sizeof_VkStructureType(&val->sType); + size += vn_sizeof_VkCopyImageToMemoryInfoMESA_pnext(val->pNext); + size += vn_sizeof_VkCopyImageToMemoryInfoMESA_self(val); + + return size; +} + +static inline void +vn_encode_VkCopyImageToMemoryInfoMESA_pnext(struct vn_cs_encoder *enc, const void *val) +{ + /* no known/supported struct */ + vn_encode_simple_pointer(enc, NULL); +} + +static inline void +vn_encode_VkCopyImageToMemoryInfoMESA_self(struct vn_cs_encoder *enc, const VkCopyImageToMemoryInfoMESA *val) +{ + /* skip val->{sType,pNext} */ + vn_encode_VkFlags(enc, &val->flags); + vn_encode_VkImage(enc, &val->srcImage); + vn_encode_VkImageLayout(enc, &val->srcImageLayout); + vn_encode_uint32_t(enc, &val->memoryRowLength); + vn_encode_uint32_t(enc, &val->memoryImageHeight); + vn_encode_VkImageSubresourceLayers(enc, &val->imageSubresource); + vn_encode_VkOffset3D(enc, &val->imageOffset); + vn_encode_VkExtent3D(enc, &val->imageExtent); +} + +static inline void +vn_encode_VkCopyImageToMemoryInfoMESA(struct vn_cs_encoder *enc, const VkCopyImageToMemoryInfoMESA *val) +{ + assert(val->sType == VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_MESA); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_MESA }); + vn_encode_VkCopyImageToMemoryInfoMESA_pnext(enc, val->pNext); + vn_encode_VkCopyImageToMemoryInfoMESA_self(enc, val); +} + +/* struct VkMemoryToImageCopyMESA chain */ + +static inline size_t +vn_sizeof_VkMemoryToImageCopyMESA_pnext(const void *val) +{ + /* no known/supported struct */ + return vn_sizeof_simple_pointer(NULL); +} + +static inline size_t +vn_sizeof_VkMemoryToImageCopyMESA_self(const VkMemoryToImageCopyMESA *val) +{ + size_t size = 0; + /* skip val->{sType,pNext} */ + size += vn_sizeof_size_t(&val->dataSize); + if (val->pData) { + size += vn_sizeof_array_size(val->dataSize); + size += vn_sizeof_blob_array(val->pData, val->dataSize); + } else { + size += vn_sizeof_array_size(0); + } + size += vn_sizeof_uint32_t(&val->memoryRowLength); + size += vn_sizeof_uint32_t(&val->memoryImageHeight); + size += vn_sizeof_VkImageSubresourceLayers(&val->imageSubresource); + size += vn_sizeof_VkOffset3D(&val->imageOffset); + size += vn_sizeof_VkExtent3D(&val->imageExtent); + return size; +} + +static inline size_t +vn_sizeof_VkMemoryToImageCopyMESA(const VkMemoryToImageCopyMESA *val) +{ + size_t size = 0; + + size += vn_sizeof_VkStructureType(&val->sType); + size += vn_sizeof_VkMemoryToImageCopyMESA_pnext(val->pNext); + size += vn_sizeof_VkMemoryToImageCopyMESA_self(val); + + return size; +} + +static inline void +vn_encode_VkMemoryToImageCopyMESA_pnext(struct vn_cs_encoder *enc, const void *val) +{ + /* no known/supported struct */ + vn_encode_simple_pointer(enc, NULL); +} + +static inline void +vn_encode_VkMemoryToImageCopyMESA_self(struct vn_cs_encoder *enc, const VkMemoryToImageCopyMESA *val) +{ + /* skip val->{sType,pNext} */ + vn_encode_size_t(enc, &val->dataSize); + if (val->pData) { + vn_encode_array_size(enc, val->dataSize); + vn_encode_blob_array(enc, val->pData, val->dataSize); + } else { + vn_encode_array_size(enc, 0); + } + vn_encode_uint32_t(enc, &val->memoryRowLength); + vn_encode_uint32_t(enc, &val->memoryImageHeight); + vn_encode_VkImageSubresourceLayers(enc, &val->imageSubresource); + vn_encode_VkOffset3D(enc, &val->imageOffset); + vn_encode_VkExtent3D(enc, &val->imageExtent); +} + +static inline void +vn_encode_VkMemoryToImageCopyMESA(struct vn_cs_encoder *enc, const VkMemoryToImageCopyMESA *val) +{ + assert(val->sType == VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_MESA); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_MESA }); + vn_encode_VkMemoryToImageCopyMESA_pnext(enc, val->pNext); + vn_encode_VkMemoryToImageCopyMESA_self(enc, val); +} + +/* struct VkCopyMemoryToImageInfoMESA chain */ + +static inline size_t +vn_sizeof_VkCopyMemoryToImageInfoMESA_pnext(const void *val) +{ + /* no known/supported struct */ + return vn_sizeof_simple_pointer(NULL); +} + +static inline size_t +vn_sizeof_VkCopyMemoryToImageInfoMESA_self(const VkCopyMemoryToImageInfoMESA *val) +{ + size_t size = 0; + /* skip val->{sType,pNext} */ + size += vn_sizeof_VkFlags(&val->flags); + size += vn_sizeof_VkImage(&val->dstImage); + size += vn_sizeof_VkImageLayout(&val->dstImageLayout); + size += vn_sizeof_uint32_t(&val->regionCount); + if (val->pRegions) { + size += vn_sizeof_array_size(val->regionCount); + for (uint32_t i = 0; i < val->regionCount; i++) + size += vn_sizeof_VkMemoryToImageCopyMESA(&val->pRegions[i]); + } else { + size += vn_sizeof_array_size(0); + } + return size; +} + +static inline size_t +vn_sizeof_VkCopyMemoryToImageInfoMESA(const VkCopyMemoryToImageInfoMESA *val) +{ + size_t size = 0; + + size += vn_sizeof_VkStructureType(&val->sType); + size += vn_sizeof_VkCopyMemoryToImageInfoMESA_pnext(val->pNext); + size += vn_sizeof_VkCopyMemoryToImageInfoMESA_self(val); + + return size; +} + +static inline void +vn_encode_VkCopyMemoryToImageInfoMESA_pnext(struct vn_cs_encoder *enc, const void *val) +{ + /* no known/supported struct */ + vn_encode_simple_pointer(enc, NULL); +} + +static inline void +vn_encode_VkCopyMemoryToImageInfoMESA_self(struct vn_cs_encoder *enc, const VkCopyMemoryToImageInfoMESA *val) +{ + /* skip val->{sType,pNext} */ + vn_encode_VkFlags(enc, &val->flags); + vn_encode_VkImage(enc, &val->dstImage); + vn_encode_VkImageLayout(enc, &val->dstImageLayout); + vn_encode_uint32_t(enc, &val->regionCount); + if (val->pRegions) { + vn_encode_array_size(enc, val->regionCount); + for (uint32_t i = 0; i < val->regionCount; i++) + vn_encode_VkMemoryToImageCopyMESA(enc, &val->pRegions[i]); + } else { + vn_encode_array_size(enc, 0); + } +} + +static inline void +vn_encode_VkCopyMemoryToImageInfoMESA(struct vn_cs_encoder *enc, const VkCopyMemoryToImageInfoMESA *val) +{ + assert(val->sType == VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_MESA); + vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_MESA }); + vn_encode_VkCopyMemoryToImageInfoMESA_pnext(enc, val->pNext); + vn_encode_VkCopyMemoryToImageInfoMESA_self(enc, val); +} + +static inline size_t vn_sizeof_vkCopyImageToImage(VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; + const VkFlags cmd_flags = 0; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); + + cmd_size += vn_sizeof_VkDevice(&device); + cmd_size += vn_sizeof_simple_pointer(pCopyImageToImageInfo); + if (pCopyImageToImageInfo) + cmd_size += vn_sizeof_VkCopyImageToImageInfo(pCopyImageToImageInfo); + + return cmd_size; +} + +static inline void vn_encode_vkCopyImageToImage(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; + + vn_encode_VkCommandTypeEXT(enc, &cmd_type); + vn_encode_VkFlags(enc, &cmd_flags); + + vn_encode_VkDevice(enc, &device); + if (vn_encode_simple_pointer(enc, pCopyImageToImageInfo)) + vn_encode_VkCopyImageToImageInfo(enc, pCopyImageToImageInfo); +} + +static inline size_t vn_sizeof_vkCopyImageToImage_reply(VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); + + VkResult ret; + cmd_size += vn_sizeof_VkResult(&ret); + /* skip device */ + /* skip pCopyImageToImageInfo */ + + return cmd_size; +} + +static inline VkResult vn_decode_vkCopyImageToImage_reply(struct vn_cs_decoder *dec, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + VkCommandTypeEXT command_type; + vn_decode_VkCommandTypeEXT(dec, &command_type); + assert(command_type == VK_COMMAND_TYPE_vkCopyImageToImage_EXT); + + VkResult ret; + vn_decode_VkResult(dec, &ret); + /* skip device */ + /* skip pCopyImageToImageInfo */ + + return ret; +} + +static inline size_t vn_sizeof_vkTransitionImageLayout(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; + const VkFlags cmd_flags = 0; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); + + cmd_size += vn_sizeof_VkDevice(&device); + cmd_size += vn_sizeof_uint32_t(&transitionCount); + if (pTransitions) { + cmd_size += vn_sizeof_array_size(transitionCount); + for (uint32_t i = 0; i < transitionCount; i++) + cmd_size += vn_sizeof_VkHostImageLayoutTransitionInfo(&pTransitions[i]); + } else { + cmd_size += vn_sizeof_array_size(0); + } + + return cmd_size; +} + +static inline void vn_encode_vkTransitionImageLayout(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; + + vn_encode_VkCommandTypeEXT(enc, &cmd_type); + vn_encode_VkFlags(enc, &cmd_flags); + + vn_encode_VkDevice(enc, &device); + vn_encode_uint32_t(enc, &transitionCount); + if (pTransitions) { + vn_encode_array_size(enc, transitionCount); + for (uint32_t i = 0; i < transitionCount; i++) + vn_encode_VkHostImageLayoutTransitionInfo(enc, &pTransitions[i]); + } else { + vn_encode_array_size(enc, 0); + } +} + +static inline size_t vn_sizeof_vkTransitionImageLayout_reply(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); + + VkResult ret; + cmd_size += vn_sizeof_VkResult(&ret); + /* skip device */ + /* skip transitionCount */ + /* skip pTransitions */ + + return cmd_size; +} + +static inline VkResult vn_decode_vkTransitionImageLayout_reply(struct vn_cs_decoder *dec, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + VkCommandTypeEXT command_type; + vn_decode_VkCommandTypeEXT(dec, &command_type); + assert(command_type == VK_COMMAND_TYPE_vkTransitionImageLayout_EXT); + + VkResult ret; + vn_decode_VkResult(dec, &ret); + /* skip device */ + /* skip transitionCount */ + /* skip pTransitions */ + + return ret; +} + +static inline size_t vn_sizeof_vkCopyImageToMemoryMESA(VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToMemoryMESA_EXT; + const VkFlags cmd_flags = 0; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); + + cmd_size += vn_sizeof_VkDevice(&device); + cmd_size += vn_sizeof_simple_pointer(pCopyImageToMemoryInfo); + if (pCopyImageToMemoryInfo) + cmd_size += vn_sizeof_VkCopyImageToMemoryInfoMESA(pCopyImageToMemoryInfo); + cmd_size += vn_sizeof_size_t(&dataSize); + cmd_size += vn_sizeof_simple_pointer(pData); /* out */ + + return cmd_size; +} + +static inline void vn_encode_vkCopyImageToMemoryMESA(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToMemoryMESA_EXT; + + vn_encode_VkCommandTypeEXT(enc, &cmd_type); + vn_encode_VkFlags(enc, &cmd_flags); + + vn_encode_VkDevice(enc, &device); + if (vn_encode_simple_pointer(enc, pCopyImageToMemoryInfo)) + vn_encode_VkCopyImageToMemoryInfoMESA(enc, pCopyImageToMemoryInfo); + vn_encode_size_t(enc, &dataSize); + vn_encode_array_size(enc, pData ? dataSize : 0); /* out */ +} + +static inline size_t vn_sizeof_vkCopyImageToMemoryMESA_reply(VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToMemoryMESA_EXT; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); + + VkResult ret; + cmd_size += vn_sizeof_VkResult(&ret); + /* skip device */ + /* skip pCopyImageToMemoryInfo */ + /* skip dataSize */ + if (pData) { + cmd_size += vn_sizeof_array_size(dataSize); + cmd_size += vn_sizeof_blob_array(pData, dataSize); + } else { + cmd_size += vn_sizeof_array_size(0); + } + + return cmd_size; +} + +static inline VkResult vn_decode_vkCopyImageToMemoryMESA_reply(struct vn_cs_decoder *dec, VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + VkCommandTypeEXT command_type; + vn_decode_VkCommandTypeEXT(dec, &command_type); + assert(command_type == VK_COMMAND_TYPE_vkCopyImageToMemoryMESA_EXT); + + VkResult ret; + vn_decode_VkResult(dec, &ret); + /* skip device */ + /* skip pCopyImageToMemoryInfo */ + /* skip dataSize */ + if (vn_peek_array_size(dec)) { + const size_t array_size = vn_decode_array_size(dec, dataSize); + vn_decode_blob_array(dec, pData, array_size); + } else { + vn_decode_array_size_unchecked(dec); + pData = NULL; + } + + return ret; +} + +static inline size_t vn_sizeof_vkCopyMemoryToImageMESA(VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyMemoryToImageMESA_EXT; + const VkFlags cmd_flags = 0; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); + + cmd_size += vn_sizeof_VkDevice(&device); + cmd_size += vn_sizeof_simple_pointer(pCopyMemoryToImageInfo); + if (pCopyMemoryToImageInfo) + cmd_size += vn_sizeof_VkCopyMemoryToImageInfoMESA(pCopyMemoryToImageInfo); + + return cmd_size; +} + +static inline void vn_encode_vkCopyMemoryToImageMESA(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyMemoryToImageMESA_EXT; + + vn_encode_VkCommandTypeEXT(enc, &cmd_type); + vn_encode_VkFlags(enc, &cmd_flags); + + vn_encode_VkDevice(enc, &device); + if (vn_encode_simple_pointer(enc, pCopyMemoryToImageInfo)) + vn_encode_VkCopyMemoryToImageInfoMESA(enc, pCopyMemoryToImageInfo); +} + +static inline size_t vn_sizeof_vkCopyMemoryToImageMESA_reply(VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyMemoryToImageMESA_EXT; + size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); + + VkResult ret; + cmd_size += vn_sizeof_VkResult(&ret); + /* skip device */ + /* skip pCopyMemoryToImageInfo */ + + return cmd_size; +} + +static inline VkResult vn_decode_vkCopyMemoryToImageMESA_reply(struct vn_cs_decoder *dec, VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + VkCommandTypeEXT command_type; + vn_decode_VkCommandTypeEXT(dec, &command_type); + assert(command_type == VK_COMMAND_TYPE_vkCopyMemoryToImageMESA_EXT); + + VkResult ret; + vn_decode_VkResult(dec, &ret); + /* skip device */ + /* skip pCopyMemoryToImageInfo */ + + return ret; +} + +static inline void vn_submit_vkCopyImageToImage(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo, struct vn_ring_submit_command *submit) +{ + uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; + void *cmd_data = local_cmd_data; + size_t cmd_size = vn_sizeof_vkCopyImageToImage(device, pCopyImageToImageInfo); + if (cmd_size > sizeof(local_cmd_data)) { + cmd_data = malloc(cmd_size); + if (!cmd_data) + cmd_size = 0; + } + const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCopyImageToImage_reply(device, pCopyImageToImageInfo) : 0; + + struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); + if (cmd_size) { + vn_encode_vkCopyImageToImage(enc, cmd_flags, device, pCopyImageToImageInfo); + vn_ring_submit_command(vn_ring, submit); + if (cmd_data != local_cmd_data) + free(cmd_data); + } +} + +static inline void vn_submit_vkTransitionImageLayout(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions, struct vn_ring_submit_command *submit) +{ + uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; + void *cmd_data = local_cmd_data; + size_t cmd_size = vn_sizeof_vkTransitionImageLayout(device, transitionCount, pTransitions); + if (cmd_size > sizeof(local_cmd_data)) { + cmd_data = malloc(cmd_size); + if (!cmd_data) + cmd_size = 0; + } + const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkTransitionImageLayout_reply(device, transitionCount, pTransitions) : 0; + + struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); + if (cmd_size) { + vn_encode_vkTransitionImageLayout(enc, cmd_flags, device, transitionCount, pTransitions); + vn_ring_submit_command(vn_ring, submit); + if (cmd_data != local_cmd_data) + free(cmd_data); + } +} + +static inline void vn_submit_vkCopyImageToMemoryMESA(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData, struct vn_ring_submit_command *submit) +{ + uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; + void *cmd_data = local_cmd_data; + size_t cmd_size = vn_sizeof_vkCopyImageToMemoryMESA(device, pCopyImageToMemoryInfo, dataSize, pData); + if (cmd_size > sizeof(local_cmd_data)) { + cmd_data = malloc(cmd_size); + if (!cmd_data) + cmd_size = 0; + } + const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCopyImageToMemoryMESA_reply(device, pCopyImageToMemoryInfo, dataSize, pData) : 0; + + struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); + if (cmd_size) { + vn_encode_vkCopyImageToMemoryMESA(enc, cmd_flags, device, pCopyImageToMemoryInfo, dataSize, pData); + vn_ring_submit_command(vn_ring, submit); + if (cmd_data != local_cmd_data) + free(cmd_data); + } +} + +static inline void vn_submit_vkCopyMemoryToImageMESA(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo, struct vn_ring_submit_command *submit) +{ + uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; + void *cmd_data = local_cmd_data; + size_t cmd_size = vn_sizeof_vkCopyMemoryToImageMESA(device, pCopyMemoryToImageInfo); + if (cmd_size > sizeof(local_cmd_data)) { + cmd_data = malloc(cmd_size); + if (!cmd_data) + cmd_size = 0; + } + const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCopyMemoryToImageMESA_reply(device, pCopyMemoryToImageInfo) : 0; + + struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); + if (cmd_size) { + vn_encode_vkCopyMemoryToImageMESA(enc, cmd_flags, device, pCopyMemoryToImageInfo); + vn_ring_submit_command(vn_ring, submit); + if (cmd_data != local_cmd_data) + free(cmd_data); + } +} + +static inline VkResult vn_call_vkCopyImageToImage(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + VN_TRACE_FUNC(); + + struct vn_ring_submit_command submit; + vn_submit_vkCopyImageToImage(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, pCopyImageToImageInfo, &submit); + struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); + if (dec) { + const VkResult ret = vn_decode_vkCopyImageToImage_reply(dec, device, pCopyImageToImageInfo); + vn_ring_free_command_reply(vn_ring, &submit); + return ret; + } else { + return VK_ERROR_OUT_OF_HOST_MEMORY; + } +} + +static inline void vn_async_vkCopyImageToImage(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) +{ + struct vn_ring_submit_command submit; + vn_submit_vkCopyImageToImage(vn_ring, 0, device, pCopyImageToImageInfo, &submit); +} + +static inline VkResult vn_call_vkTransitionImageLayout(struct vn_ring *vn_ring, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + VN_TRACE_FUNC(); + + struct vn_ring_submit_command submit; + vn_submit_vkTransitionImageLayout(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, transitionCount, pTransitions, &submit); + struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); + if (dec) { + const VkResult ret = vn_decode_vkTransitionImageLayout_reply(dec, device, transitionCount, pTransitions); + vn_ring_free_command_reply(vn_ring, &submit); + return ret; + } else { + return VK_ERROR_OUT_OF_HOST_MEMORY; + } +} + +static inline void vn_async_vkTransitionImageLayout(struct vn_ring *vn_ring, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) +{ + struct vn_ring_submit_command submit; + vn_submit_vkTransitionImageLayout(vn_ring, 0, device, transitionCount, pTransitions, &submit); +} + +static inline VkResult vn_call_vkCopyImageToMemoryMESA(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + VN_TRACE_FUNC(); + + struct vn_ring_submit_command submit; + vn_submit_vkCopyImageToMemoryMESA(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, pCopyImageToMemoryInfo, dataSize, pData, &submit); + struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); + if (dec) { + const VkResult ret = vn_decode_vkCopyImageToMemoryMESA_reply(dec, device, pCopyImageToMemoryInfo, dataSize, pData); + vn_ring_free_command_reply(vn_ring, &submit); + return ret; + } else { + return VK_ERROR_OUT_OF_HOST_MEMORY; + } +} + +static inline void vn_async_vkCopyImageToMemoryMESA(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToMemoryInfoMESA* pCopyImageToMemoryInfo, size_t dataSize, void* pData) +{ + struct vn_ring_submit_command submit; + vn_submit_vkCopyImageToMemoryMESA(vn_ring, 0, device, pCopyImageToMemoryInfo, dataSize, pData, &submit); +} + +static inline VkResult vn_call_vkCopyMemoryToImageMESA(struct vn_ring *vn_ring, VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + VN_TRACE_FUNC(); + + struct vn_ring_submit_command submit; + vn_submit_vkCopyMemoryToImageMESA(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, pCopyMemoryToImageInfo, &submit); + struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); + if (dec) { + const VkResult ret = vn_decode_vkCopyMemoryToImageMESA_reply(dec, device, pCopyMemoryToImageInfo); + vn_ring_free_command_reply(vn_ring, &submit); + return ret; + } else { + return VK_ERROR_OUT_OF_HOST_MEMORY; + } +} + +static inline void vn_async_vkCopyMemoryToImageMESA(struct vn_ring *vn_ring, VkDevice device, const VkCopyMemoryToImageInfoMESA* pCopyMemoryToImageInfo) +{ + struct vn_ring_submit_command submit; + vn_submit_vkCopyMemoryToImageMESA(vn_ring, 0, device, pCopyMemoryToImageInfo, &submit); +} + +#endif /* VN_PROTOCOL_DRIVER_HOST_COPY_H */ diff --git a/src/virtio/venus-protocol/vn_protocol_driver_image.h b/src/virtio/venus-protocol/vn_protocol_driver_image.h index 9eb3789d1bc..c2900cb9caf 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_image.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_image.h @@ -11,13 +11,6 @@ #include "vn_ring.h" #include "vn_protocol_driver_structs.h" -/* - * These structs/unions/commands are not included - * - * vkCopyMemoryToImage - * vkCopyImageToMemory - */ - /* struct VkSparseImageMemoryRequirements */ static inline size_t @@ -1201,142 +1194,6 @@ vn_encode_VkImageDrmFormatModifierPropertiesEXT_partial(struct vn_cs_encoder *en vn_encode_VkImageDrmFormatModifierPropertiesEXT_self_partial(enc, val); } -/* struct VkCopyImageToImageInfo chain */ - -static inline size_t -vn_sizeof_VkCopyImageToImageInfo_pnext(const void *val) -{ - /* no known/supported struct */ - return vn_sizeof_simple_pointer(NULL); -} - -static inline size_t -vn_sizeof_VkCopyImageToImageInfo_self(const VkCopyImageToImageInfo *val) -{ - size_t size = 0; - /* skip val->{sType,pNext} */ - size += vn_sizeof_VkFlags(&val->flags); - size += vn_sizeof_VkImage(&val->srcImage); - size += vn_sizeof_VkImageLayout(&val->srcImageLayout); - size += vn_sizeof_VkImage(&val->dstImage); - size += vn_sizeof_VkImageLayout(&val->dstImageLayout); - size += vn_sizeof_uint32_t(&val->regionCount); - if (val->pRegions) { - size += vn_sizeof_array_size(val->regionCount); - for (uint32_t i = 0; i < val->regionCount; i++) - size += vn_sizeof_VkImageCopy2(&val->pRegions[i]); - } else { - size += vn_sizeof_array_size(0); - } - return size; -} - -static inline size_t -vn_sizeof_VkCopyImageToImageInfo(const VkCopyImageToImageInfo *val) -{ - size_t size = 0; - - size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkCopyImageToImageInfo_pnext(val->pNext); - size += vn_sizeof_VkCopyImageToImageInfo_self(val); - - return size; -} - -static inline void -vn_encode_VkCopyImageToImageInfo_pnext(struct vn_cs_encoder *enc, const void *val) -{ - /* no known/supported struct */ - vn_encode_simple_pointer(enc, NULL); -} - -static inline void -vn_encode_VkCopyImageToImageInfo_self(struct vn_cs_encoder *enc, const VkCopyImageToImageInfo *val) -{ - /* skip val->{sType,pNext} */ - vn_encode_VkFlags(enc, &val->flags); - vn_encode_VkImage(enc, &val->srcImage); - vn_encode_VkImageLayout(enc, &val->srcImageLayout); - vn_encode_VkImage(enc, &val->dstImage); - vn_encode_VkImageLayout(enc, &val->dstImageLayout); - vn_encode_uint32_t(enc, &val->regionCount); - if (val->pRegions) { - vn_encode_array_size(enc, val->regionCount); - for (uint32_t i = 0; i < val->regionCount; i++) - vn_encode_VkImageCopy2(enc, &val->pRegions[i]); - } else { - vn_encode_array_size(enc, 0); - } -} - -static inline void -vn_encode_VkCopyImageToImageInfo(struct vn_cs_encoder *enc, const VkCopyImageToImageInfo *val) -{ - assert(val->sType == VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO }); - vn_encode_VkCopyImageToImageInfo_pnext(enc, val->pNext); - vn_encode_VkCopyImageToImageInfo_self(enc, val); -} - -/* struct VkHostImageLayoutTransitionInfo chain */ - -static inline size_t -vn_sizeof_VkHostImageLayoutTransitionInfo_pnext(const void *val) -{ - /* no known/supported struct */ - return vn_sizeof_simple_pointer(NULL); -} - -static inline size_t -vn_sizeof_VkHostImageLayoutTransitionInfo_self(const VkHostImageLayoutTransitionInfo *val) -{ - size_t size = 0; - /* skip val->{sType,pNext} */ - size += vn_sizeof_VkImage(&val->image); - size += vn_sizeof_VkImageLayout(&val->oldLayout); - size += vn_sizeof_VkImageLayout(&val->newLayout); - size += vn_sizeof_VkImageSubresourceRange(&val->subresourceRange); - return size; -} - -static inline size_t -vn_sizeof_VkHostImageLayoutTransitionInfo(const VkHostImageLayoutTransitionInfo *val) -{ - size_t size = 0; - - size += vn_sizeof_VkStructureType(&val->sType); - size += vn_sizeof_VkHostImageLayoutTransitionInfo_pnext(val->pNext); - size += vn_sizeof_VkHostImageLayoutTransitionInfo_self(val); - - return size; -} - -static inline void -vn_encode_VkHostImageLayoutTransitionInfo_pnext(struct vn_cs_encoder *enc, const void *val) -{ - /* no known/supported struct */ - vn_encode_simple_pointer(enc, NULL); -} - -static inline void -vn_encode_VkHostImageLayoutTransitionInfo_self(struct vn_cs_encoder *enc, const VkHostImageLayoutTransitionInfo *val) -{ - /* skip val->{sType,pNext} */ - vn_encode_VkImage(enc, &val->image); - vn_encode_VkImageLayout(enc, &val->oldLayout); - vn_encode_VkImageLayout(enc, &val->newLayout); - vn_encode_VkImageSubresourceRange(enc, &val->subresourceRange); -} - -static inline void -vn_encode_VkHostImageLayoutTransitionInfo(struct vn_cs_encoder *enc, const VkHostImageLayoutTransitionInfo *val) -{ - assert(val->sType == VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO); - vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO }); - vn_encode_VkHostImageLayoutTransitionInfo_pnext(enc, val->pNext); - vn_encode_VkHostImageLayoutTransitionInfo_self(enc, val); -} - /* struct VkImageSubresource2 chain */ static inline size_t @@ -2560,125 +2417,6 @@ static inline VkResult vn_decode_vkGetImageDrmFormatModifierPropertiesEXT_reply( return ret; } -static inline size_t vn_sizeof_vkCopyImageToImage(VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; - const VkFlags cmd_flags = 0; - size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); - - cmd_size += vn_sizeof_VkDevice(&device); - cmd_size += vn_sizeof_simple_pointer(pCopyImageToImageInfo); - if (pCopyImageToImageInfo) - cmd_size += vn_sizeof_VkCopyImageToImageInfo(pCopyImageToImageInfo); - - return cmd_size; -} - -static inline void vn_encode_vkCopyImageToImage(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; - - vn_encode_VkCommandTypeEXT(enc, &cmd_type); - vn_encode_VkFlags(enc, &cmd_flags); - - vn_encode_VkDevice(enc, &device); - if (vn_encode_simple_pointer(enc, pCopyImageToImageInfo)) - vn_encode_VkCopyImageToImageInfo(enc, pCopyImageToImageInfo); -} - -static inline size_t vn_sizeof_vkCopyImageToImage_reply(VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCopyImageToImage_EXT; - size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); - - VkResult ret; - cmd_size += vn_sizeof_VkResult(&ret); - /* skip device */ - /* skip pCopyImageToImageInfo */ - - return cmd_size; -} - -static inline VkResult vn_decode_vkCopyImageToImage_reply(struct vn_cs_decoder *dec, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - VkCommandTypeEXT command_type; - vn_decode_VkCommandTypeEXT(dec, &command_type); - assert(command_type == VK_COMMAND_TYPE_vkCopyImageToImage_EXT); - - VkResult ret; - vn_decode_VkResult(dec, &ret); - /* skip device */ - /* skip pCopyImageToImageInfo */ - - return ret; -} - -static inline size_t vn_sizeof_vkTransitionImageLayout(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; - const VkFlags cmd_flags = 0; - size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags); - - cmd_size += vn_sizeof_VkDevice(&device); - cmd_size += vn_sizeof_uint32_t(&transitionCount); - if (pTransitions) { - cmd_size += vn_sizeof_array_size(transitionCount); - for (uint32_t i = 0; i < transitionCount; i++) - cmd_size += vn_sizeof_VkHostImageLayoutTransitionInfo(&pTransitions[i]); - } else { - cmd_size += vn_sizeof_array_size(0); - } - - return cmd_size; -} - -static inline void vn_encode_vkTransitionImageLayout(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; - - vn_encode_VkCommandTypeEXT(enc, &cmd_type); - vn_encode_VkFlags(enc, &cmd_flags); - - vn_encode_VkDevice(enc, &device); - vn_encode_uint32_t(enc, &transitionCount); - if (pTransitions) { - vn_encode_array_size(enc, transitionCount); - for (uint32_t i = 0; i < transitionCount; i++) - vn_encode_VkHostImageLayoutTransitionInfo(enc, &pTransitions[i]); - } else { - vn_encode_array_size(enc, 0); - } -} - -static inline size_t vn_sizeof_vkTransitionImageLayout_reply(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkTransitionImageLayout_EXT; - size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type); - - VkResult ret; - cmd_size += vn_sizeof_VkResult(&ret); - /* skip device */ - /* skip transitionCount */ - /* skip pTransitions */ - - return cmd_size; -} - -static inline VkResult vn_decode_vkTransitionImageLayout_reply(struct vn_cs_decoder *dec, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - VkCommandTypeEXT command_type; - vn_decode_VkCommandTypeEXT(dec, &command_type); - assert(command_type == VK_COMMAND_TYPE_vkTransitionImageLayout_EXT); - - VkResult ret; - vn_decode_VkResult(dec, &ret); - /* skip device */ - /* skip transitionCount */ - /* skip pTransitions */ - - return ret; -} - static inline size_t vn_sizeof_vkGetImageSubresourceLayout2(VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout) { const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkGetImageSubresourceLayout2_EXT; @@ -3055,48 +2793,6 @@ static inline void vn_submit_vkGetImageDrmFormatModifierPropertiesEXT(struct vn_ } } -static inline void vn_submit_vkCopyImageToImage(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo, struct vn_ring_submit_command *submit) -{ - uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; - void *cmd_data = local_cmd_data; - size_t cmd_size = vn_sizeof_vkCopyImageToImage(device, pCopyImageToImageInfo); - if (cmd_size > sizeof(local_cmd_data)) { - cmd_data = malloc(cmd_size); - if (!cmd_data) - cmd_size = 0; - } - const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCopyImageToImage_reply(device, pCopyImageToImageInfo) : 0; - - struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); - if (cmd_size) { - vn_encode_vkCopyImageToImage(enc, cmd_flags, device, pCopyImageToImageInfo); - vn_ring_submit_command(vn_ring, submit); - if (cmd_data != local_cmd_data) - free(cmd_data); - } -} - -static inline void vn_submit_vkTransitionImageLayout(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions, struct vn_ring_submit_command *submit) -{ - uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; - void *cmd_data = local_cmd_data; - size_t cmd_size = vn_sizeof_vkTransitionImageLayout(device, transitionCount, pTransitions); - if (cmd_size > sizeof(local_cmd_data)) { - cmd_data = malloc(cmd_size); - if (!cmd_data) - cmd_size = 0; - } - const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkTransitionImageLayout_reply(device, transitionCount, pTransitions) : 0; - - struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size); - if (cmd_size) { - vn_encode_vkTransitionImageLayout(enc, cmd_flags, device, transitionCount, pTransitions); - vn_ring_submit_command(vn_ring, submit); - if (cmd_data != local_cmd_data) - free(cmd_data); - } -} - static inline void vn_submit_vkGetImageSubresourceLayout2(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout, struct vn_ring_submit_command *submit) { uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE]; @@ -3379,50 +3075,6 @@ static inline void vn_async_vkGetImageDrmFormatModifierPropertiesEXT(struct vn_r vn_submit_vkGetImageDrmFormatModifierPropertiesEXT(vn_ring, 0, device, image, pProperties, &submit); } -static inline VkResult vn_call_vkCopyImageToImage(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - VN_TRACE_FUNC(); - - struct vn_ring_submit_command submit; - vn_submit_vkCopyImageToImage(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, pCopyImageToImageInfo, &submit); - struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); - if (dec) { - const VkResult ret = vn_decode_vkCopyImageToImage_reply(dec, device, pCopyImageToImageInfo); - vn_ring_free_command_reply(vn_ring, &submit); - return ret; - } else { - return VK_ERROR_OUT_OF_HOST_MEMORY; - } -} - -static inline void vn_async_vkCopyImageToImage(struct vn_ring *vn_ring, VkDevice device, const VkCopyImageToImageInfo* pCopyImageToImageInfo) -{ - struct vn_ring_submit_command submit; - vn_submit_vkCopyImageToImage(vn_ring, 0, device, pCopyImageToImageInfo, &submit); -} - -static inline VkResult vn_call_vkTransitionImageLayout(struct vn_ring *vn_ring, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - VN_TRACE_FUNC(); - - struct vn_ring_submit_command submit; - vn_submit_vkTransitionImageLayout(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, device, transitionCount, pTransitions, &submit); - struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit); - if (dec) { - const VkResult ret = vn_decode_vkTransitionImageLayout_reply(dec, device, transitionCount, pTransitions); - vn_ring_free_command_reply(vn_ring, &submit); - return ret; - } else { - return VK_ERROR_OUT_OF_HOST_MEMORY; - } -} - -static inline void vn_async_vkTransitionImageLayout(struct vn_ring *vn_ring, VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo* pTransitions) -{ - struct vn_ring_submit_command submit; - vn_submit_vkTransitionImageLayout(vn_ring, 0, device, transitionCount, pTransitions, &submit); -} - static inline void vn_call_vkGetImageSubresourceLayout2(struct vn_ring *vn_ring, VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout) { VN_TRACE_FUNC(); diff --git a/src/virtio/venus-protocol/vn_protocol_driver_info.h b/src/virtio/venus-protocol/vn_protocol_driver_info.h index 9855c038cb1..f7e4339d9b0 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_info.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_info.h @@ -156,7 +156,7 @@ static const struct vn_info_extension _vn_info_extensions[137] = { { "VK_KHR_vertex_attribute_divisor", 526, 1 }, { "VK_KHR_vulkan_memory_model", 212, 3 }, { "VK_KHR_zero_initialize_workgroup_memory", 326, 1 }, - { "VK_MESA_venus_protocol", 385, 2 }, + { "VK_MESA_venus_protocol", 385, 3 }, { "VK_VALVE_mutable_descriptor_type", 352, 1 }, };