diff options
author | Yiwei Zhang <zzyiwei@chromium.org> | 2023-06-05 22:59:05 -0700 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-06-06 19:42:42 +0000 |
commit | f72292adb9151729a66e474ee88ae941c10f1946 (patch) | |
tree | 95ffbf666a0d7d9a9807ad18e490920b60023063 | |
parent | 3509abef6c37100337bb24bc6c7a88991b19f323 (diff) |
vkr: sync protocol to adopt vkr_cs_decoder_alloc_temp_array
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1141>
22 files changed, 202 insertions, 195 deletions
diff --git a/src/venus/venus-protocol/vn_protocol_renderer.h b/src/venus/venus-protocol/vn_protocol_renderer.h index 003fb03..41de55b 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer.h +++ b/src/venus/venus-protocol/vn_protocol_renderer.h @@ -1,4 +1,4 @@ -/* This file is generated by venus-protocol git-1edb4daf. */ +/* This file is generated by venus-protocol git-5f7e36ce. */ /* * Copyright 2020 Google LLC diff --git a/src/venus/venus-protocol/vn_protocol_renderer_buffer.h b/src/venus/venus-protocol/vn_protocol_renderer_buffer.h index 6d7c319..bb258b9 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_buffer.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_buffer.h @@ -181,7 +181,7 @@ vn_decode_VkBufferCreateInfo_self_temp(struct vn_cs_decoder *dec, VkBufferCreate vn_decode_uint32_t(dec, &val->queueFamilyIndexCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->queueFamilyIndexCount); - val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pQueueFamilyIndices) * array_size); + val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pQueueFamilyIndices), array_size); if (!val->pQueueFamilyIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pQueueFamilyIndices, array_size); } else { @@ -258,7 +258,7 @@ vn_decode_VkBindBufferMemoryDeviceGroupInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->deviceIndexCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->deviceIndexCount); - val->pDeviceIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDeviceIndices) * array_size); + val->pDeviceIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDeviceIndices), array_size); if (!val->pDeviceIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pDeviceIndices, array_size); } else { @@ -708,7 +708,7 @@ static inline void vn_decode_vkBindBufferMemory2_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->bindInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindInfoCount); - args->pBindInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBindInfos) * iter_count); + args->pBindInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBindInfos), iter_count); if (!args->pBindInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBindBufferMemoryInfo_temp(dec, &((VkBindBufferMemoryInfo *)args->pBindInfos)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h b/src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h index 0d4531b..4495a52 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h @@ -161,7 +161,7 @@ vn_decode_VkCommandBufferInheritanceRenderingInfo_self_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &val->colorAttachmentCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pColorAttachmentFormats = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pColorAttachmentFormats) * array_size); + val->pColorAttachmentFormats = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pColorAttachmentFormats), array_size); if (!val->pColorAttachmentFormats) return; vn_decode_VkFormat_array(dec, (VkFormat *)val->pColorAttachmentFormats, array_size); } else { @@ -986,7 +986,7 @@ vn_decode_VkDeviceGroupRenderPassBeginInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->deviceRenderAreaCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->deviceRenderAreaCount); - val->pDeviceRenderAreas = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDeviceRenderAreas) * iter_count); + val->pDeviceRenderAreas = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDeviceRenderAreas), iter_count); if (!val->pDeviceRenderAreas) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRect2D_temp(dec, &((VkRect2D *)val->pDeviceRenderAreas)[i]); @@ -1058,7 +1058,7 @@ vn_decode_VkRenderPassAttachmentBeginInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_uint32_t(dec, &val->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentCount); - val->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachments) * iter_count); + val->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachments), iter_count); if (!val->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageView_lookup(dec, &((VkImageView *)val->pAttachments)[i]); @@ -1160,7 +1160,7 @@ vn_decode_VkRenderPassBeginInfo_self_temp(struct vn_cs_decoder *dec, VkRenderPas vn_decode_uint32_t(dec, &val->clearValueCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->clearValueCount); - val->pClearValues = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pClearValues) * iter_count); + val->pClearValues = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pClearValues), iter_count); if (!val->pClearValues) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkClearValue_temp(dec, &((VkClearValue *)val->pClearValues)[i]); @@ -1412,7 +1412,7 @@ vn_decode_VkCopyBufferInfo2_self_temp(struct vn_cs_decoder *dec, VkCopyBufferInf vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferCopy2_temp(dec, &((VkBufferCopy2 *)val->pRegions)[i]); @@ -1554,7 +1554,7 @@ vn_decode_VkCopyImageInfo2_self_temp(struct vn_cs_decoder *dec, VkCopyImageInfo2 vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageCopy2_temp(dec, &((VkImageCopy2 *)val->pRegions)[i]); @@ -1706,7 +1706,7 @@ vn_decode_VkBlitImageInfo2_self_temp(struct vn_cs_decoder *dec, VkBlitImageInfo2 vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageBlit2_temp(dec, &((VkImageBlit2 *)val->pRegions)[i]); @@ -1853,7 +1853,7 @@ vn_decode_VkCopyBufferToImageInfo2_self_temp(struct vn_cs_decoder *dec, VkCopyBu vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferImageCopy2_temp(dec, &((VkBufferImageCopy2 *)val->pRegions)[i]); @@ -1930,7 +1930,7 @@ vn_decode_VkCopyImageToBufferInfo2_self_temp(struct vn_cs_decoder *dec, VkCopyIm vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferImageCopy2_temp(dec, &((VkBufferImageCopy2 *)val->pRegions)[i]); @@ -2073,7 +2073,7 @@ vn_decode_VkResolveImageInfo2_self_temp(struct vn_cs_decoder *dec, VkResolveImag vn_decode_uint32_t(dec, &val->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->regionCount); - val->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pRegions) * iter_count); + val->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pRegions), iter_count); if (!val->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageResolve2_temp(dec, &((VkImageResolve2 *)val->pRegions)[i]); @@ -2297,7 +2297,7 @@ vn_decode_VkDependencyInfo_self_temp(struct vn_cs_decoder *dec, VkDependencyInfo vn_decode_uint32_t(dec, &val->memoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->memoryBarrierCount); - val->pMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pMemoryBarriers) * iter_count); + val->pMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pMemoryBarriers), iter_count); if (!val->pMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMemoryBarrier2_temp(dec, &((VkMemoryBarrier2 *)val->pMemoryBarriers)[i]); @@ -2308,7 +2308,7 @@ vn_decode_VkDependencyInfo_self_temp(struct vn_cs_decoder *dec, VkDependencyInfo vn_decode_uint32_t(dec, &val->bufferMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bufferMemoryBarrierCount); - val->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBufferMemoryBarriers) * iter_count); + val->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBufferMemoryBarriers), iter_count); if (!val->pBufferMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferMemoryBarrier2_temp(dec, &((VkBufferMemoryBarrier2 *)val->pBufferMemoryBarriers)[i]); @@ -2319,7 +2319,7 @@ vn_decode_VkDependencyInfo_self_temp(struct vn_cs_decoder *dec, VkDependencyInfo vn_decode_uint32_t(dec, &val->imageMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->imageMemoryBarrierCount); - val->pImageMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pImageMemoryBarriers) * iter_count); + val->pImageMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pImageMemoryBarriers), iter_count); if (!val->pImageMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageMemoryBarrier2_temp(dec, &((VkImageMemoryBarrier2 *)val->pImageMemoryBarriers)[i]); @@ -2496,7 +2496,7 @@ vn_decode_VkRenderingInfo_self_temp(struct vn_cs_decoder *dec, VkRenderingInfo * vn_decode_uint32_t(dec, &val->colorAttachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pColorAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pColorAttachments) * iter_count); + val->pColorAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pColorAttachments), iter_count); if (!val->pColorAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRenderingAttachmentInfo_temp(dec, &((VkRenderingAttachmentInfo *)val->pColorAttachments)[i]); @@ -2587,7 +2587,7 @@ static inline void vn_decode_vkAllocateCommandBuffers_args_temp(struct vn_cs_dec } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pAllocateInfo ? args->pAllocateInfo->commandBufferCount : 0)); - args->pCommandBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCommandBuffers) * iter_count); + args->pCommandBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCommandBuffers), iter_count); if (!args->pCommandBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandBuffer_temp(dec, &args->pCommandBuffers[i]); @@ -2628,7 +2628,7 @@ static inline void vn_decode_vkFreeCommandBuffers_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->commandBufferCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->commandBufferCount); - args->pCommandBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCommandBuffers) * iter_count); + args->pCommandBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCommandBuffers), iter_count); if (!args->pCommandBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandBuffer_lookup(dec, &((VkCommandBuffer *)args->pCommandBuffers)[i]); @@ -2757,7 +2757,7 @@ static inline void vn_decode_vkCmdSetViewport_args_temp(struct vn_cs_decoder *de vn_decode_uint32_t(dec, &args->viewportCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->viewportCount); - args->pViewports = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pViewports) * iter_count); + args->pViewports = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pViewports), iter_count); if (!args->pViewports) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkViewport_temp(dec, &((VkViewport *)args->pViewports)[i]); @@ -2795,7 +2795,7 @@ static inline void vn_decode_vkCmdSetScissor_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->scissorCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->scissorCount); - args->pScissors = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pScissors) * iter_count); + args->pScissors = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pScissors), iter_count); if (!args->pScissors) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRect2D_temp(dec, &((VkRect2D *)args->pScissors)[i]); @@ -2996,7 +2996,7 @@ static inline void vn_decode_vkCmdBindDescriptorSets_args_temp(struct vn_cs_deco vn_decode_uint32_t(dec, &args->descriptorSetCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->descriptorSetCount); - args->pDescriptorSets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorSets) * iter_count); + args->pDescriptorSets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorSets), iter_count); if (!args->pDescriptorSets) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSet_lookup(dec, &((VkDescriptorSet *)args->pDescriptorSets)[i]); @@ -3007,7 +3007,7 @@ static inline void vn_decode_vkCmdBindDescriptorSets_args_temp(struct vn_cs_deco vn_decode_uint32_t(dec, &args->dynamicOffsetCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->dynamicOffsetCount); - args->pDynamicOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDynamicOffsets) * array_size); + args->pDynamicOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDynamicOffsets), array_size); if (!args->pDynamicOffsets) return; vn_decode_uint32_t_array(dec, (uint32_t *)args->pDynamicOffsets, array_size); } else { @@ -3078,7 +3078,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers_args_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &args->bindingCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindingCount); - args->pBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBuffers) * iter_count); + args->pBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBuffers), iter_count); if (!args->pBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBuffer_lookup(dec, &((VkBuffer *)args->pBuffers)[i]); @@ -3088,7 +3088,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers_args_temp(struct vn_cs_decod } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pOffsets) * array_size); + args->pOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pOffsets), array_size); if (!args->pOffsets) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pOffsets, array_size); } else { @@ -3187,7 +3187,7 @@ static inline void vn_decode_vkCmdDrawMultiEXT_args_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &args->drawCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->drawCount); - args->pVertexInfo = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pVertexInfo) * iter_count); + args->pVertexInfo = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pVertexInfo), iter_count); if (!args->pVertexInfo) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMultiDrawInfoEXT_temp(dec, &((VkMultiDrawInfoEXT *)args->pVertexInfo)[i]); @@ -3231,7 +3231,7 @@ static inline void vn_decode_vkCmdDrawMultiIndexedEXT_args_temp(struct vn_cs_dec vn_decode_uint32_t(dec, &args->drawCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->drawCount); - args->pIndexInfo = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pIndexInfo) * iter_count); + args->pIndexInfo = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pIndexInfo), iter_count); if (!args->pIndexInfo) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMultiDrawIndexedInfoEXT_temp(dec, &((VkMultiDrawIndexedInfoEXT *)args->pIndexInfo)[i]); @@ -3393,7 +3393,7 @@ static inline void vn_decode_vkCmdCopyBuffer_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferCopy_temp(dec, &((VkBufferCopy *)args->pRegions)[i]); @@ -3436,7 +3436,7 @@ static inline void vn_decode_vkCmdCopyImage_args_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageCopy_temp(dec, &((VkImageCopy *)args->pRegions)[i]); @@ -3483,7 +3483,7 @@ static inline void vn_decode_vkCmdBlitImage_args_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageBlit_temp(dec, &((VkImageBlit *)args->pRegions)[i]); @@ -3532,7 +3532,7 @@ static inline void vn_decode_vkCmdCopyBufferToImage_args_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferImageCopy_temp(dec, &((VkBufferImageCopy *)args->pRegions)[i]); @@ -3576,7 +3576,7 @@ static inline void vn_decode_vkCmdCopyImageToBuffer_args_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferImageCopy_temp(dec, &((VkBufferImageCopy *)args->pRegions)[i]); @@ -3692,7 +3692,7 @@ static inline void vn_decode_vkCmdClearColorImage_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->rangeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->rangeCount); - args->pRanges = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRanges) * iter_count); + args->pRanges = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRanges), iter_count); if (!args->pRanges) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageSubresourceRange_temp(dec, &((VkImageSubresourceRange *)args->pRanges)[i]); @@ -3743,7 +3743,7 @@ static inline void vn_decode_vkCmdClearDepthStencilImage_args_temp(struct vn_cs_ vn_decode_uint32_t(dec, &args->rangeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->rangeCount); - args->pRanges = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRanges) * iter_count); + args->pRanges = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRanges), iter_count); if (!args->pRanges) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageSubresourceRange_temp(dec, &((VkImageSubresourceRange *)args->pRanges)[i]); @@ -3785,7 +3785,7 @@ static inline void vn_decode_vkCmdClearAttachments_args_temp(struct vn_cs_decode vn_decode_uint32_t(dec, &args->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->attachmentCount); - args->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pAttachments) * iter_count); + args->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pAttachments), iter_count); if (!args->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkClearAttachment_temp(dec, &((VkClearAttachment *)args->pAttachments)[i]); @@ -3796,7 +3796,7 @@ static inline void vn_decode_vkCmdClearAttachments_args_temp(struct vn_cs_decode vn_decode_uint32_t(dec, &args->rectCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->rectCount); - args->pRects = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRects) * iter_count); + args->pRects = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRects), iter_count); if (!args->pRects) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkClearRect_temp(dec, &((VkClearRect *)args->pRects)[i]); @@ -3842,7 +3842,7 @@ static inline void vn_decode_vkCmdResolveImage_args_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &args->regionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->regionCount); - args->pRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pRegions) * iter_count); + args->pRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pRegions), iter_count); if (!args->pRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageResolve_temp(dec, &((VkImageResolve *)args->pRegions)[i]); @@ -3931,7 +3931,7 @@ static inline void vn_decode_vkCmdWaitEvents_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->eventCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->eventCount); - args->pEvents = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pEvents) * iter_count); + args->pEvents = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pEvents), iter_count); if (!args->pEvents) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkEvent_lookup(dec, &((VkEvent *)args->pEvents)[i]); @@ -3944,7 +3944,7 @@ static inline void vn_decode_vkCmdWaitEvents_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->memoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->memoryBarrierCount); - args->pMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pMemoryBarriers) * iter_count); + args->pMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pMemoryBarriers), iter_count); if (!args->pMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMemoryBarrier_temp(dec, &((VkMemoryBarrier *)args->pMemoryBarriers)[i]); @@ -3955,7 +3955,7 @@ static inline void vn_decode_vkCmdWaitEvents_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->bufferMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bufferMemoryBarrierCount); - args->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBufferMemoryBarriers) * iter_count); + args->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBufferMemoryBarriers), iter_count); if (!args->pBufferMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferMemoryBarrier_temp(dec, &((VkBufferMemoryBarrier *)args->pBufferMemoryBarriers)[i]); @@ -3966,7 +3966,7 @@ static inline void vn_decode_vkCmdWaitEvents_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->imageMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->imageMemoryBarrierCount); - args->pImageMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pImageMemoryBarriers) * iter_count); + args->pImageMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pImageMemoryBarriers), iter_count); if (!args->pImageMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageMemoryBarrier_temp(dec, &((VkImageMemoryBarrier *)args->pImageMemoryBarriers)[i]); @@ -4029,7 +4029,7 @@ static inline void vn_decode_vkCmdPipelineBarrier_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->memoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->memoryBarrierCount); - args->pMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pMemoryBarriers) * iter_count); + args->pMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pMemoryBarriers), iter_count); if (!args->pMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMemoryBarrier_temp(dec, &((VkMemoryBarrier *)args->pMemoryBarriers)[i]); @@ -4040,7 +4040,7 @@ static inline void vn_decode_vkCmdPipelineBarrier_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->bufferMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bufferMemoryBarrierCount); - args->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBufferMemoryBarriers) * iter_count); + args->pBufferMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBufferMemoryBarriers), iter_count); if (!args->pBufferMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferMemoryBarrier_temp(dec, &((VkBufferMemoryBarrier *)args->pBufferMemoryBarriers)[i]); @@ -4051,7 +4051,7 @@ static inline void vn_decode_vkCmdPipelineBarrier_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->imageMemoryBarrierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->imageMemoryBarrierCount); - args->pImageMemoryBarriers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pImageMemoryBarriers) * iter_count); + args->pImageMemoryBarriers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pImageMemoryBarriers), iter_count); if (!args->pImageMemoryBarriers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageMemoryBarrier_temp(dec, &((VkImageMemoryBarrier *)args->pImageMemoryBarriers)[i]); @@ -4398,7 +4398,7 @@ static inline void vn_decode_vkCmdExecuteCommands_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->commandBufferCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->commandBufferCount); - args->pCommandBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCommandBuffers) * iter_count); + args->pCommandBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCommandBuffers), iter_count); if (!args->pCommandBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandBuffer_lookup(dec, &((VkCommandBuffer *)args->pCommandBuffers)[i]); @@ -4436,7 +4436,7 @@ static inline void vn_decode_vkCmdPushDescriptorSetKHR_args_temp(struct vn_cs_de vn_decode_uint32_t(dec, &args->descriptorWriteCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->descriptorWriteCount); - args->pDescriptorWrites = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorWrites) * iter_count); + args->pDescriptorWrites = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorWrites), iter_count); if (!args->pDescriptorWrites) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkWriteDescriptorSet_temp(dec, &((VkWriteDescriptorSet *)args->pDescriptorWrites)[i]); @@ -4709,7 +4709,7 @@ static inline void vn_decode_vkCmdBindTransformFeedbackBuffersEXT_args_temp(stru vn_decode_uint32_t(dec, &args->bindingCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindingCount); - args->pBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBuffers) * iter_count); + args->pBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBuffers), iter_count); if (!args->pBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBuffer_lookup(dec, &((VkBuffer *)args->pBuffers)[i]); @@ -4719,7 +4719,7 @@ static inline void vn_decode_vkCmdBindTransformFeedbackBuffersEXT_args_temp(stru } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pOffsets) * array_size); + args->pOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pOffsets), array_size); if (!args->pOffsets) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pOffsets, array_size); } else { @@ -4728,7 +4728,7 @@ static inline void vn_decode_vkCmdBindTransformFeedbackBuffersEXT_args_temp(stru } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pSizes = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSizes) * array_size); + args->pSizes = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSizes), array_size); if (!args->pSizes) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pSizes, array_size); } else { @@ -4769,7 +4769,7 @@ static inline void vn_decode_vkCmdBeginTransformFeedbackEXT_args_temp(struct vn_ vn_decode_uint32_t(dec, &args->counterBufferCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->counterBufferCount); - args->pCounterBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCounterBuffers) * iter_count); + args->pCounterBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCounterBuffers), iter_count); if (!args->pCounterBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBuffer_lookup(dec, &((VkBuffer *)args->pCounterBuffers)[i]); @@ -4779,7 +4779,7 @@ static inline void vn_decode_vkCmdBeginTransformFeedbackEXT_args_temp(struct vn_ } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->counterBufferCount); - args->pCounterBufferOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCounterBufferOffsets) * array_size); + args->pCounterBufferOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCounterBufferOffsets), array_size); if (!args->pCounterBufferOffsets) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pCounterBufferOffsets, array_size); } else { @@ -4818,7 +4818,7 @@ static inline void vn_decode_vkCmdEndTransformFeedbackEXT_args_temp(struct vn_cs vn_decode_uint32_t(dec, &args->counterBufferCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->counterBufferCount); - args->pCounterBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCounterBuffers) * iter_count); + args->pCounterBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCounterBuffers), iter_count); if (!args->pCounterBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBuffer_lookup(dec, &((VkBuffer *)args->pCounterBuffers)[i]); @@ -4828,7 +4828,7 @@ static inline void vn_decode_vkCmdEndTransformFeedbackEXT_args_temp(struct vn_cs } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->counterBufferCount); - args->pCounterBufferOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCounterBufferOffsets) * array_size); + args->pCounterBufferOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCounterBufferOffsets), array_size); if (!args->pCounterBufferOffsets) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pCounterBufferOffsets, array_size); } else { @@ -5039,7 +5039,7 @@ static inline void vn_decode_vkCmdSetViewportWithCount_args_temp(struct vn_cs_de vn_decode_uint32_t(dec, &args->viewportCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->viewportCount); - args->pViewports = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pViewports) * iter_count); + args->pViewports = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pViewports), iter_count); if (!args->pViewports) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkViewport_temp(dec, &((VkViewport *)args->pViewports)[i]); @@ -5074,7 +5074,7 @@ static inline void vn_decode_vkCmdSetScissorWithCount_args_temp(struct vn_cs_dec vn_decode_uint32_t(dec, &args->scissorCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->scissorCount); - args->pScissors = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pScissors) * iter_count); + args->pScissors = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pScissors), iter_count); if (!args->pScissors) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRect2D_temp(dec, &((VkRect2D *)args->pScissors)[i]); @@ -5110,7 +5110,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers2_args_temp(struct vn_cs_deco vn_decode_uint32_t(dec, &args->bindingCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindingCount); - args->pBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBuffers) * iter_count); + args->pBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBuffers), iter_count); if (!args->pBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBuffer_lookup(dec, &((VkBuffer *)args->pBuffers)[i]); @@ -5120,7 +5120,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers2_args_temp(struct vn_cs_deco } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pOffsets) * array_size); + args->pOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pOffsets), array_size); if (!args->pOffsets) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pOffsets, array_size); } else { @@ -5129,7 +5129,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers2_args_temp(struct vn_cs_deco } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pSizes = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSizes) * array_size); + args->pSizes = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSizes), array_size); if (!args->pSizes) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pSizes, array_size); } else { @@ -5138,7 +5138,7 @@ static inline void vn_decode_vkCmdBindVertexBuffers2_args_temp(struct vn_cs_deco } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->bindingCount); - args->pStrides = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pStrides) * array_size); + args->pStrides = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pStrides), array_size); if (!args->pStrides) return; vn_decode_VkDeviceSize_array(dec, (VkDeviceSize *)args->pStrides, array_size); } else { @@ -5634,7 +5634,7 @@ static inline void vn_decode_vkCmdWaitEvents2_args_temp(struct vn_cs_decoder *de vn_decode_uint32_t(dec, &args->eventCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->eventCount); - args->pEvents = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pEvents) * iter_count); + args->pEvents = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pEvents), iter_count); if (!args->pEvents) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkEvent_lookup(dec, &((VkEvent *)args->pEvents)[i]); @@ -5644,7 +5644,7 @@ static inline void vn_decode_vkCmdWaitEvents2_args_temp(struct vn_cs_decoder *de } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->eventCount); - args->pDependencyInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDependencyInfos) * iter_count); + args->pDependencyInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDependencyInfos), iter_count); if (!args->pDependencyInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDependencyInfo_temp(dec, &((VkDependencyInfo *)args->pDependencyInfos)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_cs.h b/src/venus/venus-protocol/vn_protocol_renderer_cs.h index d929827..602c3df 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_cs.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_cs.h @@ -83,6 +83,13 @@ vn_cs_decoder_alloc_temp(struct vn_cs_decoder *dec, size_t size) return vkr_cs_decoder_alloc_temp(d, size); } +static inline void * +vn_cs_decoder_alloc_temp_array(struct vn_cs_decoder *dec, size_t size, size_t count) +{ + struct vkr_cs_decoder *d = (struct vkr_cs_decoder *)dec; + return vkr_cs_decoder_alloc_temp_array(d, size, count); +} + static inline void vn_cs_decoder_read(struct vn_cs_decoder *dec, size_t size, void *val, size_t val_size) { diff --git a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h index 7982658..7d0a899 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h @@ -138,7 +138,7 @@ vn_decode_VkDescriptorPoolCreateInfo_self_temp(struct vn_cs_decoder *dec, VkDesc vn_decode_uint32_t(dec, &val->poolSizeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->poolSizeCount); - val->pPoolSizes = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPoolSizes) * iter_count); + val->pPoolSizes = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPoolSizes), iter_count); if (!val->pPoolSizes) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorPoolSize_temp(dec, &((VkDescriptorPoolSize *)val->pPoolSizes)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h index 2fc1968..0f1624b 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h @@ -41,7 +41,7 @@ vn_decode_VkDescriptorSetVariableDescriptorCountAllocateInfo_self_temp(struct vn vn_decode_uint32_t(dec, &val->descriptorSetCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->descriptorSetCount); - val->pDescriptorCounts = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDescriptorCounts) * array_size); + val->pDescriptorCounts = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDescriptorCounts), array_size); if (!val->pDescriptorCounts) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pDescriptorCounts, array_size); } else { @@ -129,7 +129,7 @@ vn_decode_VkDescriptorSetAllocateInfo_self_temp(struct vn_cs_decoder *dec, VkDes vn_decode_uint32_t(dec, &val->descriptorSetCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorSetCount); - val->pSetLayouts = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSetLayouts) * iter_count); + val->pSetLayouts = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSetLayouts), iter_count); if (!val->pSetLayouts) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSetLayout_lookup(dec, &((VkDescriptorSetLayout *)val->pSetLayouts)[i]); @@ -268,7 +268,7 @@ static inline void vn_decode_vkAllocateDescriptorSets_args_temp(struct vn_cs_dec } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pAllocateInfo ? args->pAllocateInfo->descriptorSetCount : 0)); - args->pDescriptorSets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorSets) * iter_count); + args->pDescriptorSets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorSets), iter_count); if (!args->pDescriptorSets) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSet(dec, &args->pDescriptorSets[i]); @@ -309,7 +309,7 @@ static inline void vn_decode_vkFreeDescriptorSets_args_temp(struct vn_cs_decoder vn_decode_uint32_t(dec, &args->descriptorSetCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->descriptorSetCount); - args->pDescriptorSets = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorSets) * iter_count); + args->pDescriptorSets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorSets), iter_count); if (!args->pDescriptorSets) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSet_lookup(dec, &((VkDescriptorSet *)args->pDescriptorSets)[i]); @@ -347,7 +347,7 @@ static inline void vn_decode_vkUpdateDescriptorSets_args_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &args->descriptorWriteCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->descriptorWriteCount); - args->pDescriptorWrites = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorWrites) * iter_count); + args->pDescriptorWrites = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorWrites), iter_count); if (!args->pDescriptorWrites) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkWriteDescriptorSet_temp(dec, &((VkWriteDescriptorSet *)args->pDescriptorWrites)[i]); @@ -358,7 +358,7 @@ static inline void vn_decode_vkUpdateDescriptorSets_args_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &args->descriptorCopyCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->descriptorCopyCount); - args->pDescriptorCopies = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDescriptorCopies) * iter_count); + args->pDescriptorCopies = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDescriptorCopies), iter_count); if (!args->pDescriptorCopies) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCopyDescriptorSet_temp(dec, &((VkCopyDescriptorSet *)args->pDescriptorCopies)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h index e38737c..5aff491 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h @@ -28,7 +28,7 @@ vn_decode_VkDescriptorSetLayoutBinding_temp(struct vn_cs_decoder *dec, VkDescrip vn_decode_VkFlags(dec, &val->stageFlags); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorCount); - val->pImmutableSamplers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pImmutableSamplers) * iter_count); + val->pImmutableSamplers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pImmutableSamplers), iter_count); if (!val->pImmutableSamplers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSampler_lookup(dec, &((VkSampler *)val->pImmutableSamplers)[i]); @@ -69,7 +69,7 @@ vn_decode_VkDescriptorSetLayoutBindingFlagsCreateInfo_self_temp(struct vn_cs_dec vn_decode_uint32_t(dec, &val->bindingCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bindingCount); - val->pBindingFlags = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBindingFlags) * iter_count); + val->pBindingFlags = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBindingFlags), iter_count); if (!val->pBindingFlags) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkFlags(dec, &((VkDescriptorBindingFlags *)val->pBindingFlags)[i]); @@ -166,7 +166,7 @@ vn_decode_VkDescriptorSetLayoutCreateInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_uint32_t(dec, &val->bindingCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bindingCount); - val->pBindings = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBindings) * iter_count); + val->pBindings = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBindings), iter_count); if (!val->pBindings) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSetLayoutBinding_temp(dec, &((VkDescriptorSetLayoutBinding *)val->pBindings)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h index d802989..e71a414 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h @@ -60,7 +60,7 @@ vn_decode_VkDescriptorUpdateTemplateCreateInfo_self_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &val->descriptorUpdateEntryCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorUpdateEntryCount); - val->pDescriptorUpdateEntries = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDescriptorUpdateEntries) * iter_count); + val->pDescriptorUpdateEntries = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDescriptorUpdateEntries), iter_count); if (!val->pDescriptorUpdateEntries) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorUpdateTemplateEntry_temp(dec, &((VkDescriptorUpdateTemplateEntry *)val->pDescriptorUpdateEntries)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_device.h b/src/venus/venus-protocol/vn_protocol_renderer_device.h index 27fc86e..dca0c6e 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_device.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_device.h @@ -693,7 +693,7 @@ vn_decode_VkDeviceQueueCreateInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceQ vn_decode_uint32_t(dec, &val->queueCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->queueCount); - val->pQueuePriorities = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pQueuePriorities) * array_size); + val->pQueuePriorities = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pQueuePriorities), array_size); if (!val->pQueuePriorities) return; vn_decode_float_array(dec, (float *)val->pQueuePriorities, array_size); } else { @@ -9108,7 +9108,7 @@ vn_decode_VkDeviceGroupDeviceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkD vn_decode_uint32_t(dec, &val->physicalDeviceCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->physicalDeviceCount); - val->pPhysicalDevices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPhysicalDevices) * iter_count); + val->pPhysicalDevices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPhysicalDevices), iter_count); if (!val->pPhysicalDevices) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPhysicalDevice_lookup(dec, &((VkPhysicalDevice *)val->pPhysicalDevices)[i]); @@ -9672,7 +9672,7 @@ vn_decode_VkDeviceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceCreate vn_decode_uint32_t(dec, &val->queueCreateInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->queueCreateInfoCount); - val->pQueueCreateInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pQueueCreateInfos) * iter_count); + val->pQueueCreateInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pQueueCreateInfos), iter_count); if (!val->pQueueCreateInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDeviceQueueCreateInfo_temp(dec, &((VkDeviceQueueCreateInfo *)val->pQueueCreateInfos)[i]); @@ -9683,11 +9683,11 @@ vn_decode_VkDeviceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceCreate vn_decode_uint32_t(dec, &val->enabledLayerCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->enabledLayerCount); - val->ppEnabledLayerNames = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledLayerNames) * iter_count); + val->ppEnabledLayerNames = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledLayerNames), iter_count); if (!val->ppEnabledLayerNames) return; for (uint32_t i = 0; i < iter_count; i++) { const size_t string_size = vn_decode_array_size_unchecked(dec); - ((char **)val->ppEnabledLayerNames)[i] = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledLayerNames[i]) * string_size); + ((char **)val->ppEnabledLayerNames)[i] = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledLayerNames[i]), string_size); if (!val->ppEnabledLayerNames[i]) return; vn_decode_char_array(dec, ((char **)val->ppEnabledLayerNames)[i], string_size); } @@ -9698,11 +9698,11 @@ vn_decode_VkDeviceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceCreate vn_decode_uint32_t(dec, &val->enabledExtensionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->enabledExtensionCount); - val->ppEnabledExtensionNames = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledExtensionNames) * iter_count); + val->ppEnabledExtensionNames = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledExtensionNames), iter_count); if (!val->ppEnabledExtensionNames) return; for (uint32_t i = 0; i < iter_count; i++) { const size_t string_size = vn_decode_array_size_unchecked(dec); - ((char **)val->ppEnabledExtensionNames)[i] = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledExtensionNames[i]) * string_size); + ((char **)val->ppEnabledExtensionNames)[i] = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledExtensionNames[i]), string_size); if (!val->ppEnabledExtensionNames[i]) return; vn_decode_char_array(dec, ((char **)val->ppEnabledExtensionNames)[i], string_size); } @@ -12609,7 +12609,7 @@ vn_decode_VkDrmFormatModifierPropertiesListEXT_self_partial_temp(struct vn_cs_de vn_decode_uint32_t(dec, &val->drmFormatModifierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->drmFormatModifierCount); - val->pDrmFormatModifierProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDrmFormatModifierProperties) * iter_count); + val->pDrmFormatModifierProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDrmFormatModifierProperties), iter_count); if (!val->pDrmFormatModifierProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDrmFormatModifierPropertiesEXT_partial_temp(dec, &val->pDrmFormatModifierProperties[i]); @@ -12756,7 +12756,7 @@ vn_decode_VkDrmFormatModifierPropertiesList2EXT_self_partial_temp(struct vn_cs_d vn_decode_uint32_t(dec, &val->drmFormatModifierCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->drmFormatModifierCount); - val->pDrmFormatModifierProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDrmFormatModifierProperties) * iter_count); + val->pDrmFormatModifierProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDrmFormatModifierProperties), iter_count); if (!val->pDrmFormatModifierProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDrmFormatModifierProperties2EXT_partial_temp(dec, &val->pDrmFormatModifierProperties[i]); @@ -12974,7 +12974,7 @@ vn_decode_VkPhysicalDeviceImageDrmFormatModifierInfoEXT_self_temp(struct vn_cs_d vn_decode_uint32_t(dec, &val->queueFamilyIndexCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->queueFamilyIndexCount); - val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pQueueFamilyIndices) * array_size); + val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pQueueFamilyIndices), array_size); if (!val->pQueueFamilyIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pQueueFamilyIndices, array_size); } else { @@ -14406,7 +14406,7 @@ static inline void vn_decode_vkEnumeratePhysicalDevices_args_temp(struct vn_cs_d } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPhysicalDeviceCount ? *args->pPhysicalDeviceCount : 0)); - args->pPhysicalDevices = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pPhysicalDevices) * iter_count); + args->pPhysicalDevices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pPhysicalDevices), iter_count); if (!args->pPhysicalDevices) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPhysicalDevice_temp(dec, &args->pPhysicalDevices[i]); @@ -14481,7 +14481,7 @@ static inline void vn_decode_vkGetPhysicalDeviceQueueFamilyProperties_args_temp( } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pQueueFamilyPropertyCount ? *args->pQueueFamilyPropertyCount : 0)); - args->pQueueFamilyProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pQueueFamilyProperties) * iter_count); + args->pQueueFamilyProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pQueueFamilyProperties), iter_count); if (!args->pQueueFamilyProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkQueueFamilyProperties_partial_temp(dec, &args->pQueueFamilyProperties[i]); @@ -14729,7 +14729,7 @@ static inline void vn_decode_vkEnumerateDeviceLayerProperties_args_temp(struct v } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkLayerProperties_partial_temp(dec, &args->pProperties[i]); @@ -14768,7 +14768,7 @@ static inline void vn_decode_vkEnumerateDeviceExtensionProperties_args_temp(stru vn_decode_VkPhysicalDevice_lookup(dec, &args->physicalDevice); if (vn_peek_array_size(dec)) { const size_t string_size = vn_decode_array_size_unchecked(dec); - args->pLayerName = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pLayerName) * string_size); + args->pLayerName = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pLayerName), string_size); if (!args->pLayerName) return; vn_decode_char_array(dec, (char *)args->pLayerName, string_size); } else { @@ -14785,7 +14785,7 @@ static inline void vn_decode_vkEnumerateDeviceExtensionProperties_args_temp(stru } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkExtensionProperties_partial_temp(dec, &args->pProperties[i]); @@ -14891,7 +14891,7 @@ static inline void vn_decode_vkGetPhysicalDeviceSparseImageFormatProperties_args } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageFormatProperties_partial_temp(dec, &args->pProperties[i]); @@ -15074,7 +15074,7 @@ static inline void vn_decode_vkGetPhysicalDeviceQueueFamilyProperties2_args_temp } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pQueueFamilyPropertyCount ? *args->pQueueFamilyPropertyCount : 0)); - args->pQueueFamilyProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pQueueFamilyProperties) * iter_count); + args->pQueueFamilyProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pQueueFamilyProperties), iter_count); if (!args->pQueueFamilyProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkQueueFamilyProperties2_partial_temp(dec, &args->pQueueFamilyProperties[i]); @@ -15156,7 +15156,7 @@ static inline void vn_decode_vkGetPhysicalDeviceSparseImageFormatProperties2_arg } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageFormatProperties2_partial_temp(dec, &args->pProperties[i]); @@ -15322,7 +15322,7 @@ static inline void vn_decode_vkEnumeratePhysicalDeviceGroups_args_temp(struct vn } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPhysicalDeviceGroupCount ? *args->pPhysicalDeviceGroupCount : 0)); - args->pPhysicalDeviceGroupProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pPhysicalDeviceGroupProperties) * iter_count); + args->pPhysicalDeviceGroupProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pPhysicalDeviceGroupProperties), iter_count); if (!args->pPhysicalDeviceGroupProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPhysicalDeviceGroupProperties_partial_temp(dec, &args->pPhysicalDeviceGroupProperties[i]); @@ -15444,7 +15444,7 @@ static inline void vn_decode_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_args } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, (args->pTimeDomainCount ? *args->pTimeDomainCount : 0)); - args->pTimeDomains = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pTimeDomains) * array_size); + args->pTimeDomains = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pTimeDomains), array_size); if (!args->pTimeDomains) return; } else { vn_decode_array_size_unchecked(dec); @@ -15481,7 +15481,7 @@ static inline void vn_decode_vkGetCalibratedTimestampsEXT_args_temp(struct vn_cs vn_decode_uint32_t(dec, &args->timestampCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->timestampCount); - args->pTimestampInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pTimestampInfos) * iter_count); + args->pTimestampInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pTimestampInfos), iter_count); if (!args->pTimestampInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCalibratedTimestampInfoEXT_temp(dec, &((VkCalibratedTimestampInfoEXT *)args->pTimestampInfos)[i]); @@ -15491,7 +15491,7 @@ static inline void vn_decode_vkGetCalibratedTimestampsEXT_args_temp(struct vn_cs } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->timestampCount); - args->pTimestamps = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pTimestamps) * array_size); + args->pTimestamps = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pTimestamps), array_size); if (!args->pTimestamps) return; } else { vn_decode_array_size(dec, args->timestampCount); @@ -15549,7 +15549,7 @@ static inline void vn_decode_vkGetPhysicalDeviceToolProperties_args_temp(struct } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pToolCount ? *args->pToolCount : 0)); - args->pToolProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pToolProperties) * iter_count); + args->pToolProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pToolProperties), iter_count); if (!args->pToolProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPhysicalDeviceToolProperties_partial_temp(dec, &args->pToolProperties[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_device_memory.h b/src/venus/venus-protocol/vn_protocol_renderer_device_memory.h index 467a167..ed64048 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_device_memory.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_device_memory.h @@ -805,7 +805,7 @@ static inline void vn_decode_vkFlushMappedMemoryRanges_args_temp(struct vn_cs_de vn_decode_uint32_t(dec, &args->memoryRangeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->memoryRangeCount); - args->pMemoryRanges = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pMemoryRanges) * iter_count); + args->pMemoryRanges = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pMemoryRanges), iter_count); if (!args->pMemoryRanges) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMappedMemoryRange_temp(dec, &((VkMappedMemoryRange *)args->pMemoryRanges)[i]); @@ -841,7 +841,7 @@ static inline void vn_decode_vkInvalidateMappedMemoryRanges_args_temp(struct vn_ vn_decode_uint32_t(dec, &args->memoryRangeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->memoryRangeCount); - args->pMemoryRanges = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pMemoryRanges) * iter_count); + args->pMemoryRanges = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pMemoryRanges), iter_count); if (!args->pMemoryRanges) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMappedMemoryRange_temp(dec, &((VkMappedMemoryRange *)args->pMemoryRanges)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_fence.h b/src/venus/venus-protocol/vn_protocol_renderer_fence.h index 59fa8d6..a0cf227 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_fence.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_fence.h @@ -241,7 +241,7 @@ static inline void vn_decode_vkResetFences_args_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &args->fenceCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->fenceCount); - args->pFences = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pFences) * iter_count); + args->pFences = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pFences), iter_count); if (!args->pFences) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkFence_lookup(dec, &((VkFence *)args->pFences)[i]); @@ -298,7 +298,7 @@ static inline void vn_decode_vkWaitForFences_args_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &args->fenceCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->fenceCount); - args->pFences = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pFences) * iter_count); + args->pFences = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pFences), iter_count); if (!args->pFences) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkFence_lookup(dec, &((VkFence *)args->pFences)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h b/src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h index c257dec..8abdc48 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h @@ -40,7 +40,7 @@ vn_decode_VkFramebufferAttachmentImageInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->viewFormatCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->viewFormatCount); - val->pViewFormats = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pViewFormats) * array_size); + val->pViewFormats = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pViewFormats), array_size); if (!val->pViewFormats) return; vn_decode_VkFormat_array(dec, (VkFormat *)val->pViewFormats, array_size); } else { @@ -112,7 +112,7 @@ vn_decode_VkFramebufferAttachmentsCreateInfo_self_temp(struct vn_cs_decoder *dec vn_decode_uint32_t(dec, &val->attachmentImageInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentImageInfoCount); - val->pAttachmentImageInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachmentImageInfos) * iter_count); + val->pAttachmentImageInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachmentImageInfos), iter_count); if (!val->pAttachmentImageInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkFramebufferAttachmentImageInfo_temp(dec, &((VkFramebufferAttachmentImageInfo *)val->pAttachmentImageInfos)[i]); @@ -205,7 +205,7 @@ vn_decode_VkFramebufferCreateInfo_self_temp(struct vn_cs_decoder *dec, VkFramebu vn_decode_uint32_t(dec, &val->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentCount); - val->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachments) * iter_count); + val->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachments), iter_count); if (!val->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkImageView_lookup(dec, &((VkImageView *)val->pAttachments)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_image.h b/src/venus/venus-protocol/vn_protocol_renderer_image.h index 0183456..074d696 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_image.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_image.h @@ -114,7 +114,7 @@ vn_decode_VkImageDrmFormatModifierListCreateInfoEXT_self_temp(struct vn_cs_decod vn_decode_uint32_t(dec, &val->drmFormatModifierCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->drmFormatModifierCount); - val->pDrmFormatModifiers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDrmFormatModifiers) * array_size); + val->pDrmFormatModifiers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDrmFormatModifiers), array_size); if (!val->pDrmFormatModifiers) return; vn_decode_uint64_t_array(dec, (uint64_t *)val->pDrmFormatModifiers, array_size); } else { @@ -224,7 +224,7 @@ vn_decode_VkImageDrmFormatModifierExplicitCreateInfoEXT_self_temp(struct vn_cs_d vn_decode_uint32_t(dec, &val->drmFormatModifierPlaneCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->drmFormatModifierPlaneCount); - val->pPlaneLayouts = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPlaneLayouts) * iter_count); + val->pPlaneLayouts = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPlaneLayouts), iter_count); if (!val->pPlaneLayouts) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubresourceLayout_temp(dec, &((VkSubresourceLayout *)val->pPlaneLayouts)[i]); @@ -358,7 +358,7 @@ vn_decode_VkImageCreateInfo_self_temp(struct vn_cs_decoder *dec, VkImageCreateIn vn_decode_uint32_t(dec, &val->queueFamilyIndexCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->queueFamilyIndexCount); - val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pQueueFamilyIndices) * array_size); + val->pQueueFamilyIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pQueueFamilyIndices), array_size); if (!val->pQueueFamilyIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pQueueFamilyIndices, array_size); } else { @@ -452,7 +452,7 @@ vn_decode_VkBindImageMemoryDeviceGroupInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->deviceIndexCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->deviceIndexCount); - val->pDeviceIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDeviceIndices) * array_size); + val->pDeviceIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDeviceIndices), array_size); if (!val->pDeviceIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pDeviceIndices, array_size); } else { @@ -462,7 +462,7 @@ vn_decode_VkBindImageMemoryDeviceGroupInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->splitInstanceBindRegionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->splitInstanceBindRegionCount); - val->pSplitInstanceBindRegions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSplitInstanceBindRegions) * iter_count); + val->pSplitInstanceBindRegions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSplitInstanceBindRegions), iter_count); if (!val->pSplitInstanceBindRegions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRect2D_temp(dec, &((VkRect2D *)val->pSplitInstanceBindRegions)[i]); @@ -1110,7 +1110,7 @@ static inline void vn_decode_vkGetImageSparseMemoryRequirements_args_temp(struct } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pSparseMemoryRequirementCount ? *args->pSparseMemoryRequirementCount : 0)); - args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSparseMemoryRequirements) * iter_count); + args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSparseMemoryRequirements), iter_count); if (!args->pSparseMemoryRequirements) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageMemoryRequirements_partial_temp(dec, &args->pSparseMemoryRequirements[i]); @@ -1267,7 +1267,7 @@ static inline void vn_decode_vkBindImageMemory2_args_temp(struct vn_cs_decoder * vn_decode_uint32_t(dec, &args->bindInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindInfoCount); - args->pBindInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBindInfos) * iter_count); + args->pBindInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBindInfos), iter_count); if (!args->pBindInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBindImageMemoryInfo_temp(dec, &((VkBindImageMemoryInfo *)args->pBindInfos)[i]); @@ -1357,7 +1357,7 @@ static inline void vn_decode_vkGetImageSparseMemoryRequirements2_args_temp(struc } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pSparseMemoryRequirementCount ? *args->pSparseMemoryRequirementCount : 0)); - args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSparseMemoryRequirements) * iter_count); + args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSparseMemoryRequirements), iter_count); if (!args->pSparseMemoryRequirements) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageMemoryRequirements2_partial_temp(dec, &args->pSparseMemoryRequirements[i]); @@ -1453,7 +1453,7 @@ static inline void vn_decode_vkGetDeviceImageSparseMemoryRequirements_args_temp( } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pSparseMemoryRequirementCount ? *args->pSparseMemoryRequirementCount : 0)); - args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSparseMemoryRequirements) * iter_count); + args->pSparseMemoryRequirements = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSparseMemoryRequirements), iter_count); if (!args->pSparseMemoryRequirements) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageMemoryRequirements2_partial_temp(dec, &args->pSparseMemoryRequirements[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_instance.h b/src/venus/venus-protocol/vn_protocol_renderer_instance.h index 0a09a94..614213d 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_instance.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_instance.h @@ -40,7 +40,7 @@ vn_decode_VkApplicationInfo_self_temp(struct vn_cs_decoder *dec, VkApplicationIn /* skip val->{sType,pNext} */ if (vn_peek_array_size(dec)) { const size_t string_size = vn_decode_array_size_unchecked(dec); - val->pApplicationName = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pApplicationName) * string_size); + val->pApplicationName = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pApplicationName), string_size); if (!val->pApplicationName) return; vn_decode_char_array(dec, (char *)val->pApplicationName, string_size); } else { @@ -50,7 +50,7 @@ vn_decode_VkApplicationInfo_self_temp(struct vn_cs_decoder *dec, VkApplicationIn vn_decode_uint32_t(dec, &val->applicationVersion); if (vn_peek_array_size(dec)) { const size_t string_size = vn_decode_array_size_unchecked(dec); - val->pEngineName = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pEngineName) * string_size); + val->pEngineName = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pEngineName), string_size); if (!val->pEngineName) return; vn_decode_char_array(dec, (char *)val->pEngineName, string_size); } else { @@ -130,11 +130,11 @@ vn_decode_VkInstanceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkInstanceCr vn_decode_uint32_t(dec, &val->enabledLayerCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->enabledLayerCount); - val->ppEnabledLayerNames = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledLayerNames) * iter_count); + val->ppEnabledLayerNames = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledLayerNames), iter_count); if (!val->ppEnabledLayerNames) return; for (uint32_t i = 0; i < iter_count; i++) { const size_t string_size = vn_decode_array_size_unchecked(dec); - ((char **)val->ppEnabledLayerNames)[i] = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledLayerNames[i]) * string_size); + ((char **)val->ppEnabledLayerNames)[i] = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledLayerNames[i]), string_size); if (!val->ppEnabledLayerNames[i]) return; vn_decode_char_array(dec, ((char **)val->ppEnabledLayerNames)[i], string_size); } @@ -145,11 +145,11 @@ vn_decode_VkInstanceCreateInfo_self_temp(struct vn_cs_decoder *dec, VkInstanceCr vn_decode_uint32_t(dec, &val->enabledExtensionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->enabledExtensionCount); - val->ppEnabledExtensionNames = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledExtensionNames) * iter_count); + val->ppEnabledExtensionNames = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledExtensionNames), iter_count); if (!val->ppEnabledExtensionNames) return; for (uint32_t i = 0; i < iter_count; i++) { const size_t string_size = vn_decode_array_size_unchecked(dec); - ((char **)val->ppEnabledExtensionNames)[i] = vn_cs_decoder_alloc_temp(dec, sizeof(*val->ppEnabledExtensionNames[i]) * string_size); + ((char **)val->ppEnabledExtensionNames)[i] = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->ppEnabledExtensionNames[i]), string_size); if (!val->ppEnabledExtensionNames[i]) return; vn_decode_char_array(dec, ((char **)val->ppEnabledExtensionNames)[i], string_size); } @@ -309,7 +309,7 @@ static inline void vn_decode_vkEnumerateInstanceLayerProperties_args_temp(struct } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkLayerProperties_partial_temp(dec, &args->pProperties[i]); @@ -345,7 +345,7 @@ static inline void vn_decode_vkEnumerateInstanceExtensionProperties_args_temp(st { if (vn_peek_array_size(dec)) { const size_t string_size = vn_decode_array_size_unchecked(dec); - args->pLayerName = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pLayerName) * string_size); + args->pLayerName = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pLayerName), string_size); if (!args->pLayerName) return; vn_decode_char_array(dec, (char *)args->pLayerName, string_size); } else { @@ -362,7 +362,7 @@ static inline void vn_decode_vkEnumerateInstanceExtensionProperties_args_temp(st } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, (args->pPropertyCount ? *args->pPropertyCount : 0)); - args->pProperties = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pProperties) * iter_count); + args->pProperties = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pProperties), iter_count); if (!args->pProperties) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkExtensionProperties_partial_temp(dec, &args->pProperties[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_pipeline.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline.h index 7c5f847..1826e46 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_pipeline.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_pipeline.h @@ -43,7 +43,7 @@ vn_decode_VkSpecializationInfo_temp(struct vn_cs_decoder *dec, VkSpecializationI vn_decode_uint32_t(dec, &val->mapEntryCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->mapEntryCount); - val->pMapEntries = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pMapEntries) * iter_count); + val->pMapEntries = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pMapEntries), iter_count); if (!val->pMapEntries) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSpecializationMapEntry_temp(dec, &((VkSpecializationMapEntry *)val->pMapEntries)[i]); @@ -180,7 +180,7 @@ vn_decode_VkPipelineShaderStageCreateInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_VkShaderModule_lookup(dec, &val->module); if (vn_peek_array_size(dec)) { const size_t string_size = vn_decode_array_size_unchecked(dec); - val->pName = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pName) * string_size); + val->pName = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pName), string_size); if (!val->pName) return; vn_decode_char_array(dec, (char *)val->pName, string_size); } else { @@ -318,7 +318,7 @@ vn_decode_VkPipelineVertexInputDivisorStateCreateInfoEXT_self_temp(struct vn_cs_ vn_decode_uint32_t(dec, &val->vertexBindingDivisorCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->vertexBindingDivisorCount); - val->pVertexBindingDivisors = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pVertexBindingDivisors) * iter_count); + val->pVertexBindingDivisors = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pVertexBindingDivisors), iter_count); if (!val->pVertexBindingDivisors) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkVertexInputBindingDivisorDescriptionEXT_temp(dec, &((VkVertexInputBindingDivisorDescriptionEXT *)val->pVertexBindingDivisors)[i]); @@ -410,7 +410,7 @@ vn_decode_VkPipelineVertexInputStateCreateInfo_self_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &val->vertexBindingDescriptionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->vertexBindingDescriptionCount); - val->pVertexBindingDescriptions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pVertexBindingDescriptions) * iter_count); + val->pVertexBindingDescriptions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pVertexBindingDescriptions), iter_count); if (!val->pVertexBindingDescriptions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkVertexInputBindingDescription_temp(dec, &((VkVertexInputBindingDescription *)val->pVertexBindingDescriptions)[i]); @@ -421,7 +421,7 @@ vn_decode_VkPipelineVertexInputStateCreateInfo_self_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &val->vertexAttributeDescriptionCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->vertexAttributeDescriptionCount); - val->pVertexAttributeDescriptions = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pVertexAttributeDescriptions) * iter_count); + val->pVertexAttributeDescriptions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pVertexAttributeDescriptions), iter_count); if (!val->pVertexAttributeDescriptions) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkVertexInputAttributeDescription_temp(dec, &((VkVertexInputAttributeDescription *)val->pVertexAttributeDescriptions)[i]); @@ -779,7 +779,7 @@ vn_decode_VkPipelineViewportStateCreateInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->viewportCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->viewportCount); - val->pViewports = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pViewports) * iter_count); + val->pViewports = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pViewports), iter_count); if (!val->pViewports) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkViewport_temp(dec, &((VkViewport *)val->pViewports)[i]); @@ -790,7 +790,7 @@ vn_decode_VkPipelineViewportStateCreateInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->scissorCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->scissorCount); - val->pScissors = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pScissors) * iter_count); + val->pScissors = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pScissors), iter_count); if (!val->pScissors) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkRect2D_temp(dec, &((VkRect2D *)val->pScissors)[i]); @@ -1316,7 +1316,7 @@ vn_decode_VkPipelineMultisampleStateCreateInfo_self_temp(struct vn_cs_decoder *d vn_decode_float(dec, &val->minSampleShading); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, (val->rasterizationSamples + 31) / 32); - val->pSampleMask = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSampleMask) * array_size); + val->pSampleMask = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSampleMask), array_size); if (!val->pSampleMask) return; vn_decode_VkSampleMask_array(dec, (VkSampleMask *)val->pSampleMask, array_size); } else { @@ -1522,7 +1522,7 @@ vn_decode_VkPipelineColorBlendStateCreateInfo_self_temp(struct vn_cs_decoder *de vn_decode_uint32_t(dec, &val->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentCount); - val->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachments) * iter_count); + val->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachments), iter_count); if (!val->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipelineColorBlendAttachmentState_temp(dec, &((VkPipelineColorBlendAttachmentState *)val->pAttachments)[i]); @@ -1602,7 +1602,7 @@ vn_decode_VkPipelineDynamicStateCreateInfo_self_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &val->dynamicStateCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->dynamicStateCount); - val->pDynamicStates = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDynamicStates) * array_size); + val->pDynamicStates = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDynamicStates), array_size); if (!val->pDynamicStates) return; vn_decode_VkDynamicState_array(dec, (VkDynamicState *)val->pDynamicStates, array_size); } else { @@ -1694,7 +1694,7 @@ vn_decode_VkPipelineCreationFeedbackCreateInfo_self_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &val->pipelineStageCreationFeedbackCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->pipelineStageCreationFeedbackCount); - val->pPipelineStageCreationFeedbacks = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPipelineStageCreationFeedbacks) * iter_count); + val->pPipelineStageCreationFeedbacks = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPipelineStageCreationFeedbacks), iter_count); if (!val->pPipelineStageCreationFeedbacks) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipelineCreationFeedback_temp(dec, &val->pPipelineStageCreationFeedbacks[i]); @@ -1768,7 +1768,7 @@ vn_decode_VkPipelineRenderingCreateInfo_self_temp(struct vn_cs_decoder *dec, VkP vn_decode_uint32_t(dec, &val->colorAttachmentCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pColorAttachmentFormats = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pColorAttachmentFormats) * array_size); + val->pColorAttachmentFormats = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pColorAttachmentFormats), array_size); if (!val->pColorAttachmentFormats) return; vn_decode_VkFormat_array(dec, (VkFormat *)val->pColorAttachmentFormats, array_size); } else { @@ -1869,7 +1869,7 @@ vn_decode_VkGraphicsPipelineCreateInfo_self_temp(struct vn_cs_decoder *dec, VkGr vn_decode_uint32_t(dec, &val->stageCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->stageCount); - val->pStages = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pStages) * iter_count); + val->pStages = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pStages), iter_count); if (!val->pStages) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipelineShaderStageCreateInfo_temp(dec, &((VkPipelineShaderStageCreateInfo *)val->pStages)[i]); @@ -2115,7 +2115,7 @@ static inline void vn_decode_vkCreateGraphicsPipelines_args_temp(struct vn_cs_de vn_decode_uint32_t(dec, &args->createInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->createInfoCount); - args->pCreateInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCreateInfos) * iter_count); + args->pCreateInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCreateInfos), iter_count); if (!args->pCreateInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkGraphicsPipelineCreateInfo_temp(dec, &((VkGraphicsPipelineCreateInfo *)args->pCreateInfos)[i]); @@ -2130,7 +2130,7 @@ static inline void vn_decode_vkCreateGraphicsPipelines_args_temp(struct vn_cs_de } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->createInfoCount); - args->pPipelines = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pPipelines) * iter_count); + args->pPipelines = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pPipelines), iter_count); if (!args->pPipelines) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipeline(dec, &args->pPipelines[i]); @@ -2179,7 +2179,7 @@ static inline void vn_decode_vkCreateComputePipelines_args_temp(struct vn_cs_dec vn_decode_uint32_t(dec, &args->createInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->createInfoCount); - args->pCreateInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pCreateInfos) * iter_count); + args->pCreateInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pCreateInfos), iter_count); if (!args->pCreateInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkComputePipelineCreateInfo_temp(dec, &((VkComputePipelineCreateInfo *)args->pCreateInfos)[i]); @@ -2194,7 +2194,7 @@ static inline void vn_decode_vkCreateComputePipelines_args_temp(struct vn_cs_dec } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->createInfoCount); - args->pPipelines = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pPipelines) * iter_count); + args->pPipelines = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pPipelines), iter_count); if (!args->pPipelines) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipeline(dec, &args->pPipelines[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h index 191fa23..712507f 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h @@ -214,7 +214,7 @@ static inline void vn_decode_vkMergePipelineCaches_args_temp(struct vn_cs_decode vn_decode_uint32_t(dec, &args->srcCacheCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->srcCacheCount); - args->pSrcCaches = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSrcCaches) * iter_count); + args->pSrcCaches = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSrcCaches), iter_count); if (!args->pSrcCaches) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPipelineCache_lookup(dec, &((VkPipelineCache *)args->pSrcCaches)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h index df35d9c..35874fb 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h @@ -54,7 +54,7 @@ vn_decode_VkPipelineLayoutCreateInfo_self_temp(struct vn_cs_decoder *dec, VkPipe vn_decode_uint32_t(dec, &val->setLayoutCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->setLayoutCount); - val->pSetLayouts = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSetLayouts) * iter_count); + val->pSetLayouts = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSetLayouts), iter_count); if (!val->pSetLayouts) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorSetLayout_lookup(dec, &((VkDescriptorSetLayout *)val->pSetLayouts)[i]); @@ -65,7 +65,7 @@ vn_decode_VkPipelineLayoutCreateInfo_self_temp(struct vn_cs_decoder *dec, VkPipe vn_decode_uint32_t(dec, &val->pushConstantRangeCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->pushConstantRangeCount); - val->pPushConstantRanges = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPushConstantRanges) * iter_count); + val->pPushConstantRanges = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPushConstantRanges), iter_count); if (!val->pPushConstantRanges) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkPushConstantRange_temp(dec, &((VkPushConstantRange *)val->pPushConstantRanges)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_queue.h b/src/venus/venus-protocol/vn_protocol_renderer_queue.h index 7a43c30..c4487b5 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_queue.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_queue.h @@ -35,7 +35,7 @@ vn_decode_VkDeviceGroupSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceG vn_decode_uint32_t(dec, &val->waitSemaphoreCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->waitSemaphoreCount); - val->pWaitSemaphoreDeviceIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitSemaphoreDeviceIndices) * array_size); + val->pWaitSemaphoreDeviceIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitSemaphoreDeviceIndices), array_size); if (!val->pWaitSemaphoreDeviceIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pWaitSemaphoreDeviceIndices, array_size); } else { @@ -45,7 +45,7 @@ vn_decode_VkDeviceGroupSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceG vn_decode_uint32_t(dec, &val->commandBufferCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->commandBufferCount); - val->pCommandBufferDeviceMasks = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCommandBufferDeviceMasks) * array_size); + val->pCommandBufferDeviceMasks = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCommandBufferDeviceMasks), array_size); if (!val->pCommandBufferDeviceMasks) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pCommandBufferDeviceMasks, array_size); } else { @@ -55,7 +55,7 @@ vn_decode_VkDeviceGroupSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkDeviceG vn_decode_uint32_t(dec, &val->signalSemaphoreCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->signalSemaphoreCount); - val->pSignalSemaphoreDeviceIndices = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSignalSemaphoreDeviceIndices) * array_size); + val->pSignalSemaphoreDeviceIndices = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSignalSemaphoreDeviceIndices), array_size); if (!val->pSignalSemaphoreDeviceIndices) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pSignalSemaphoreDeviceIndices, array_size); } else { @@ -183,7 +183,7 @@ vn_decode_VkTimelineSemaphoreSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkT vn_decode_uint32_t(dec, &val->waitSemaphoreValueCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->waitSemaphoreValueCount); - val->pWaitSemaphoreValues = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitSemaphoreValues) * array_size); + val->pWaitSemaphoreValues = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitSemaphoreValues), array_size); if (!val->pWaitSemaphoreValues) return; vn_decode_uint64_t_array(dec, (uint64_t *)val->pWaitSemaphoreValues, array_size); } else { @@ -193,7 +193,7 @@ vn_decode_VkTimelineSemaphoreSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkT vn_decode_uint32_t(dec, &val->signalSemaphoreValueCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->signalSemaphoreValueCount); - val->pSignalSemaphoreValues = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSignalSemaphoreValues) * array_size); + val->pSignalSemaphoreValues = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSignalSemaphoreValues), array_size); if (!val->pSignalSemaphoreValues) return; vn_decode_uint64_t_array(dec, (uint64_t *)val->pSignalSemaphoreValues, array_size); } else { @@ -298,7 +298,7 @@ vn_decode_VkSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo *val) vn_decode_uint32_t(dec, &val->waitSemaphoreCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->waitSemaphoreCount); - val->pWaitSemaphores = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitSemaphores) * iter_count); + val->pWaitSemaphores = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitSemaphores), iter_count); if (!val->pWaitSemaphores) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphore_lookup(dec, &((VkSemaphore *)val->pWaitSemaphores)[i]); @@ -308,7 +308,7 @@ vn_decode_VkSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo *val) } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->waitSemaphoreCount); - val->pWaitDstStageMask = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitDstStageMask) * iter_count); + val->pWaitDstStageMask = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitDstStageMask), iter_count); if (!val->pWaitDstStageMask) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkFlags(dec, &((VkPipelineStageFlags *)val->pWaitDstStageMask)[i]); @@ -319,7 +319,7 @@ vn_decode_VkSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo *val) vn_decode_uint32_t(dec, &val->commandBufferCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->commandBufferCount); - val->pCommandBuffers = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCommandBuffers) * iter_count); + val->pCommandBuffers = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCommandBuffers), iter_count); if (!val->pCommandBuffers) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandBuffer_lookup(dec, &((VkCommandBuffer *)val->pCommandBuffers)[i]); @@ -330,7 +330,7 @@ vn_decode_VkSubmitInfo_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo *val) vn_decode_uint32_t(dec, &val->signalSemaphoreCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->signalSemaphoreCount); - val->pSignalSemaphores = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSignalSemaphores) * iter_count); + val->pSignalSemaphores = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSignalSemaphores), iter_count); if (!val->pSignalSemaphores) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphore_lookup(dec, &((VkSemaphore *)val->pSignalSemaphores)[i]); @@ -434,7 +434,7 @@ vn_decode_VkSparseBufferMemoryBindInfo_temp(struct vn_cs_decoder *dec, VkSparseB vn_decode_uint32_t(dec, &val->bindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bindCount); - val->pBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBinds) * iter_count); + val->pBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBinds), iter_count); if (!val->pBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseMemoryBind_temp(dec, &((VkSparseMemoryBind *)val->pBinds)[i]); @@ -464,7 +464,7 @@ vn_decode_VkSparseImageOpaqueMemoryBindInfo_temp(struct vn_cs_decoder *dec, VkSp vn_decode_uint32_t(dec, &val->bindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bindCount); - val->pBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBinds) * iter_count); + val->pBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBinds), iter_count); if (!val->pBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseMemoryBind_temp(dec, &((VkSparseMemoryBind *)val->pBinds)[i]); @@ -518,7 +518,7 @@ vn_decode_VkSparseImageMemoryBindInfo_temp(struct vn_cs_decoder *dec, VkSparseIm vn_decode_uint32_t(dec, &val->bindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bindCount); - val->pBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBinds) * iter_count); + val->pBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBinds), iter_count); if (!val->pBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageMemoryBind_temp(dec, &((VkSparseImageMemoryBind *)val->pBinds)[i]); @@ -644,7 +644,7 @@ vn_decode_VkBindSparseInfo_self_temp(struct vn_cs_decoder *dec, VkBindSparseInfo vn_decode_uint32_t(dec, &val->waitSemaphoreCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->waitSemaphoreCount); - val->pWaitSemaphores = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitSemaphores) * iter_count); + val->pWaitSemaphores = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitSemaphores), iter_count); if (!val->pWaitSemaphores) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphore_lookup(dec, &((VkSemaphore *)val->pWaitSemaphores)[i]); @@ -655,7 +655,7 @@ vn_decode_VkBindSparseInfo_self_temp(struct vn_cs_decoder *dec, VkBindSparseInfo vn_decode_uint32_t(dec, &val->bufferBindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->bufferBindCount); - val->pBufferBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBufferBinds) * iter_count); + val->pBufferBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBufferBinds), iter_count); if (!val->pBufferBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseBufferMemoryBindInfo_temp(dec, &((VkSparseBufferMemoryBindInfo *)val->pBufferBinds)[i]); @@ -666,7 +666,7 @@ vn_decode_VkBindSparseInfo_self_temp(struct vn_cs_decoder *dec, VkBindSparseInfo vn_decode_uint32_t(dec, &val->imageOpaqueBindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->imageOpaqueBindCount); - val->pImageOpaqueBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pImageOpaqueBinds) * iter_count); + val->pImageOpaqueBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pImageOpaqueBinds), iter_count); if (!val->pImageOpaqueBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageOpaqueMemoryBindInfo_temp(dec, &((VkSparseImageOpaqueMemoryBindInfo *)val->pImageOpaqueBinds)[i]); @@ -677,7 +677,7 @@ vn_decode_VkBindSparseInfo_self_temp(struct vn_cs_decoder *dec, VkBindSparseInfo vn_decode_uint32_t(dec, &val->imageBindCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->imageBindCount); - val->pImageBinds = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pImageBinds) * iter_count); + val->pImageBinds = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pImageBinds), iter_count); if (!val->pImageBinds) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSparseImageMemoryBindInfo_temp(dec, &((VkSparseImageMemoryBindInfo *)val->pImageBinds)[i]); @@ -688,7 +688,7 @@ vn_decode_VkBindSparseInfo_self_temp(struct vn_cs_decoder *dec, VkBindSparseInfo vn_decode_uint32_t(dec, &val->signalSemaphoreCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->signalSemaphoreCount); - val->pSignalSemaphores = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSignalSemaphores) * iter_count); + val->pSignalSemaphores = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSignalSemaphores), iter_count); if (!val->pSignalSemaphores) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphore_lookup(dec, &((VkSemaphore *)val->pSignalSemaphores)[i]); @@ -908,7 +908,7 @@ vn_decode_VkSubmitInfo2_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo2 *val) vn_decode_uint32_t(dec, &val->waitSemaphoreInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->waitSemaphoreInfoCount); - val->pWaitSemaphoreInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pWaitSemaphoreInfos) * iter_count); + val->pWaitSemaphoreInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pWaitSemaphoreInfos), iter_count); if (!val->pWaitSemaphoreInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphoreSubmitInfo_temp(dec, &((VkSemaphoreSubmitInfo *)val->pWaitSemaphoreInfos)[i]); @@ -919,7 +919,7 @@ vn_decode_VkSubmitInfo2_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo2 *val) vn_decode_uint32_t(dec, &val->commandBufferInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->commandBufferInfoCount); - val->pCommandBufferInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCommandBufferInfos) * iter_count); + val->pCommandBufferInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCommandBufferInfos), iter_count); if (!val->pCommandBufferInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandBufferSubmitInfo_temp(dec, &((VkCommandBufferSubmitInfo *)val->pCommandBufferInfos)[i]); @@ -930,7 +930,7 @@ vn_decode_VkSubmitInfo2_self_temp(struct vn_cs_decoder *dec, VkSubmitInfo2 *val) vn_decode_uint32_t(dec, &val->signalSemaphoreInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->signalSemaphoreInfoCount); - val->pSignalSemaphoreInfos = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSignalSemaphoreInfos) * iter_count); + val->pSignalSemaphoreInfos = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSignalSemaphoreInfos), iter_count); if (!val->pSignalSemaphoreInfos) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphoreSubmitInfo_temp(dec, &((VkSemaphoreSubmitInfo *)val->pSignalSemaphoreInfos)[i]); @@ -1000,7 +1000,7 @@ static inline void vn_decode_vkQueueSubmit_args_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &args->submitCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->submitCount); - args->pSubmits = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSubmits) * iter_count); + args->pSubmits = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSubmits), iter_count); if (!args->pSubmits) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubmitInfo_temp(dec, &((VkSubmitInfo *)args->pSubmits)[i]); @@ -1057,7 +1057,7 @@ static inline void vn_decode_vkQueueBindSparse_args_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &args->bindInfoCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->bindInfoCount); - args->pBindInfo = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pBindInfo) * iter_count); + args->pBindInfo = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pBindInfo), iter_count); if (!args->pBindInfo) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBindSparseInfo_temp(dec, &((VkBindSparseInfo *)args->pBindInfo)[i]); @@ -1096,7 +1096,7 @@ static inline void vn_decode_vkQueueSubmit2_args_temp(struct vn_cs_decoder *dec, vn_decode_uint32_t(dec, &args->submitCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->submitCount); - args->pSubmits = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pSubmits) * iter_count); + args->pSubmits = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pSubmits), iter_count); if (!args->pSubmits) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubmitInfo2_temp(dec, &((VkSubmitInfo2 *)args->pSubmits)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_render_pass.h b/src/venus/venus-protocol/vn_protocol_renderer_render_pass.h index 2987bbe..ffdf21a 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_render_pass.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_render_pass.h @@ -73,7 +73,7 @@ vn_decode_VkSubpassDescription_temp(struct vn_cs_decoder *dec, VkSubpassDescript vn_decode_uint32_t(dec, &val->inputAttachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->inputAttachmentCount); - val->pInputAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pInputAttachments) * iter_count); + val->pInputAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pInputAttachments), iter_count); if (!val->pInputAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference_temp(dec, &((VkAttachmentReference *)val->pInputAttachments)[i]); @@ -84,7 +84,7 @@ vn_decode_VkSubpassDescription_temp(struct vn_cs_decoder *dec, VkSubpassDescript vn_decode_uint32_t(dec, &val->colorAttachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pColorAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pColorAttachments) * iter_count); + val->pColorAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pColorAttachments), iter_count); if (!val->pColorAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference_temp(dec, &((VkAttachmentReference *)val->pColorAttachments)[i]); @@ -94,7 +94,7 @@ vn_decode_VkSubpassDescription_temp(struct vn_cs_decoder *dec, VkSubpassDescript } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pResolveAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pResolveAttachments) * iter_count); + val->pResolveAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pResolveAttachments), iter_count); if (!val->pResolveAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference_temp(dec, &((VkAttachmentReference *)val->pResolveAttachments)[i]); @@ -112,7 +112,7 @@ vn_decode_VkSubpassDescription_temp(struct vn_cs_decoder *dec, VkSubpassDescript vn_decode_uint32_t(dec, &val->preserveAttachmentCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->preserveAttachmentCount); - val->pPreserveAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPreserveAttachments) * array_size); + val->pPreserveAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPreserveAttachments), array_size); if (!val->pPreserveAttachments) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pPreserveAttachments, array_size); } else { @@ -190,7 +190,7 @@ vn_decode_VkRenderPassMultiviewCreateInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_uint32_t(dec, &val->subpassCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->subpassCount); - val->pViewMasks = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pViewMasks) * array_size); + val->pViewMasks = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pViewMasks), array_size); if (!val->pViewMasks) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pViewMasks, array_size); } else { @@ -200,7 +200,7 @@ vn_decode_VkRenderPassMultiviewCreateInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_uint32_t(dec, &val->dependencyCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->dependencyCount); - val->pViewOffsets = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pViewOffsets) * array_size); + val->pViewOffsets = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pViewOffsets), array_size); if (!val->pViewOffsets) return; vn_decode_int32_t_array(dec, (int32_t *)val->pViewOffsets, array_size); } else { @@ -210,7 +210,7 @@ vn_decode_VkRenderPassMultiviewCreateInfo_self_temp(struct vn_cs_decoder *dec, V vn_decode_uint32_t(dec, &val->correlationMaskCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->correlationMaskCount); - val->pCorrelationMasks = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCorrelationMasks) * array_size); + val->pCorrelationMasks = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCorrelationMasks), array_size); if (!val->pCorrelationMasks) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pCorrelationMasks, array_size); } else { @@ -299,7 +299,7 @@ vn_decode_VkRenderPassInputAttachmentAspectCreateInfo_self_temp(struct vn_cs_dec vn_decode_uint32_t(dec, &val->aspectReferenceCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->aspectReferenceCount); - val->pAspectReferences = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAspectReferences) * iter_count); + val->pAspectReferences = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAspectReferences), iter_count); if (!val->pAspectReferences) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkInputAttachmentAspectReference_temp(dec, &((VkInputAttachmentAspectReference *)val->pAspectReferences)[i]); @@ -399,7 +399,7 @@ vn_decode_VkRenderPassCreateInfo_self_temp(struct vn_cs_decoder *dec, VkRenderPa vn_decode_uint32_t(dec, &val->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentCount); - val->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachments) * iter_count); + val->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachments), iter_count); if (!val->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentDescription_temp(dec, &((VkAttachmentDescription *)val->pAttachments)[i]); @@ -410,7 +410,7 @@ vn_decode_VkRenderPassCreateInfo_self_temp(struct vn_cs_decoder *dec, VkRenderPa vn_decode_uint32_t(dec, &val->subpassCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->subpassCount); - val->pSubpasses = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSubpasses) * iter_count); + val->pSubpasses = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSubpasses), iter_count); if (!val->pSubpasses) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubpassDescription_temp(dec, &((VkSubpassDescription *)val->pSubpasses)[i]); @@ -421,7 +421,7 @@ vn_decode_VkRenderPassCreateInfo_self_temp(struct vn_cs_decoder *dec, VkRenderPa vn_decode_uint32_t(dec, &val->dependencyCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->dependencyCount); - val->pDependencies = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDependencies) * iter_count); + val->pDependencies = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDependencies), iter_count); if (!val->pDependencies) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubpassDependency_temp(dec, &((VkSubpassDependency *)val->pDependencies)[i]); @@ -896,7 +896,7 @@ vn_decode_VkSubpassDescription2_self_temp(struct vn_cs_decoder *dec, VkSubpassDe vn_decode_uint32_t(dec, &val->inputAttachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->inputAttachmentCount); - val->pInputAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pInputAttachments) * iter_count); + val->pInputAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pInputAttachments), iter_count); if (!val->pInputAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference2_temp(dec, &((VkAttachmentReference2 *)val->pInputAttachments)[i]); @@ -907,7 +907,7 @@ vn_decode_VkSubpassDescription2_self_temp(struct vn_cs_decoder *dec, VkSubpassDe vn_decode_uint32_t(dec, &val->colorAttachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pColorAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pColorAttachments) * iter_count); + val->pColorAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pColorAttachments), iter_count); if (!val->pColorAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference2_temp(dec, &((VkAttachmentReference2 *)val->pColorAttachments)[i]); @@ -917,7 +917,7 @@ vn_decode_VkSubpassDescription2_self_temp(struct vn_cs_decoder *dec, VkSubpassDe } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->colorAttachmentCount); - val->pResolveAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pResolveAttachments) * iter_count); + val->pResolveAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pResolveAttachments), iter_count); if (!val->pResolveAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentReference2_temp(dec, &((VkAttachmentReference2 *)val->pResolveAttachments)[i]); @@ -935,7 +935,7 @@ vn_decode_VkSubpassDescription2_self_temp(struct vn_cs_decoder *dec, VkSubpassDe vn_decode_uint32_t(dec, &val->preserveAttachmentCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->preserveAttachmentCount); - val->pPreserveAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pPreserveAttachments) * array_size); + val->pPreserveAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pPreserveAttachments), array_size); if (!val->pPreserveAttachments) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pPreserveAttachments, array_size); } else { @@ -1119,7 +1119,7 @@ vn_decode_VkRenderPassCreateInfo2_self_temp(struct vn_cs_decoder *dec, VkRenderP vn_decode_uint32_t(dec, &val->attachmentCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->attachmentCount); - val->pAttachments = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pAttachments) * iter_count); + val->pAttachments = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pAttachments), iter_count); if (!val->pAttachments) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkAttachmentDescription2_temp(dec, &((VkAttachmentDescription2 *)val->pAttachments)[i]); @@ -1130,7 +1130,7 @@ vn_decode_VkRenderPassCreateInfo2_self_temp(struct vn_cs_decoder *dec, VkRenderP vn_decode_uint32_t(dec, &val->subpassCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->subpassCount); - val->pSubpasses = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSubpasses) * iter_count); + val->pSubpasses = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSubpasses), iter_count); if (!val->pSubpasses) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubpassDescription2_temp(dec, &((VkSubpassDescription2 *)val->pSubpasses)[i]); @@ -1141,7 +1141,7 @@ vn_decode_VkRenderPassCreateInfo2_self_temp(struct vn_cs_decoder *dec, VkRenderP vn_decode_uint32_t(dec, &val->dependencyCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->dependencyCount); - val->pDependencies = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDependencies) * iter_count); + val->pDependencies = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDependencies), iter_count); if (!val->pDependencies) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSubpassDependency2_temp(dec, &((VkSubpassDependency2 *)val->pDependencies)[i]); @@ -1152,7 +1152,7 @@ vn_decode_VkRenderPassCreateInfo2_self_temp(struct vn_cs_decoder *dec, VkRenderP vn_decode_uint32_t(dec, &val->correlatedViewMaskCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->correlatedViewMaskCount); - val->pCorrelatedViewMasks = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCorrelatedViewMasks) * array_size); + val->pCorrelatedViewMasks = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCorrelatedViewMasks), array_size); if (!val->pCorrelatedViewMasks) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pCorrelatedViewMasks, array_size); } else { diff --git a/src/venus/venus-protocol/vn_protocol_renderer_semaphore.h b/src/venus/venus-protocol/vn_protocol_renderer_semaphore.h index 37c0194..02602fe 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_semaphore.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_semaphore.h @@ -191,7 +191,7 @@ vn_decode_VkSemaphoreWaitInfo_self_temp(struct vn_cs_decoder *dec, VkSemaphoreWa vn_decode_uint32_t(dec, &val->semaphoreCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->semaphoreCount); - val->pSemaphores = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pSemaphores) * iter_count); + val->pSemaphores = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pSemaphores), iter_count); if (!val->pSemaphores) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkSemaphore_lookup(dec, &((VkSemaphore *)val->pSemaphores)[i]); @@ -201,7 +201,7 @@ vn_decode_VkSemaphoreWaitInfo_self_temp(struct vn_cs_decoder *dec, VkSemaphoreWa } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->semaphoreCount); - val->pValues = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pValues) * array_size); + val->pValues = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pValues), array_size); if (!val->pValues) return; vn_decode_uint64_t_array(dec, (uint64_t *)val->pValues, array_size); } else { diff --git a/src/venus/venus-protocol/vn_protocol_renderer_structs.h b/src/venus/venus-protocol/vn_protocol_renderer_structs.h index 10f6102..9ea9eb3 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_structs.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_structs.h @@ -262,7 +262,7 @@ vn_decode_VkImageFormatListCreateInfo_self_temp(struct vn_cs_decoder *dec, VkIma vn_decode_uint32_t(dec, &val->viewFormatCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->viewFormatCount); - val->pViewFormats = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pViewFormats) * array_size); + val->pViewFormats = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pViewFormats), array_size); if (!val->pViewFormats) return; vn_decode_VkFormat_array(dec, (VkFormat *)val->pViewFormats, array_size); } else { @@ -504,7 +504,7 @@ vn_decode_VkShaderModuleCreateInfo_self_temp(struct vn_cs_decoder *dec, VkShader vn_decode_size_t(dec, &val->codeSize); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->codeSize / 4); - val->pCode = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pCode) * array_size); + val->pCode = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pCode), array_size); if (!val->pCode) return; vn_decode_uint32_t_array(dec, (uint32_t *)val->pCode, array_size); } else { @@ -708,7 +708,7 @@ vn_decode_VkMutableDescriptorTypeListEXT_temp(struct vn_cs_decoder *dec, VkMutab vn_decode_uint32_t(dec, &val->descriptorTypeCount); if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, val->descriptorTypeCount); - val->pDescriptorTypes = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pDescriptorTypes) * array_size); + val->pDescriptorTypes = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pDescriptorTypes), array_size); if (!val->pDescriptorTypes) return; vn_decode_VkDescriptorType_array(dec, (VkDescriptorType *)val->pDescriptorTypes, array_size); } else { @@ -742,7 +742,7 @@ vn_decode_VkMutableDescriptorTypeCreateInfoEXT_self_temp(struct vn_cs_decoder *d vn_decode_uint32_t(dec, &val->mutableDescriptorTypeListCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->mutableDescriptorTypeListCount); - val->pMutableDescriptorTypeLists = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pMutableDescriptorTypeLists) * iter_count); + val->pMutableDescriptorTypeLists = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pMutableDescriptorTypeLists), iter_count); if (!val->pMutableDescriptorTypeLists) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkMutableDescriptorTypeListEXT_temp(dec, &((VkMutableDescriptorTypeListEXT *)val->pMutableDescriptorTypeLists)[i]); @@ -940,7 +940,7 @@ vn_decode_VkWriteDescriptorSet_self_temp(struct vn_cs_decoder *dec, VkWriteDescr vn_decode_VkDescriptorType(dec, &val->descriptorType); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorCount); - val->pImageInfo = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pImageInfo) * iter_count); + val->pImageInfo = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pImageInfo), iter_count); if (!val->pImageInfo) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorImageInfo_temp(dec, &((VkDescriptorImageInfo *)val->pImageInfo)[i]); @@ -950,7 +950,7 @@ vn_decode_VkWriteDescriptorSet_self_temp(struct vn_cs_decoder *dec, VkWriteDescr } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorCount); - val->pBufferInfo = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pBufferInfo) * iter_count); + val->pBufferInfo = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pBufferInfo), iter_count); if (!val->pBufferInfo) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkDescriptorBufferInfo_temp(dec, &((VkDescriptorBufferInfo *)val->pBufferInfo)[i]); @@ -960,7 +960,7 @@ vn_decode_VkWriteDescriptorSet_self_temp(struct vn_cs_decoder *dec, VkWriteDescr } if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, val->descriptorCount); - val->pTexelBufferView = vn_cs_decoder_alloc_temp(dec, sizeof(*val->pTexelBufferView) * iter_count); + val->pTexelBufferView = vn_cs_decoder_alloc_temp_array(dec, sizeof(*val->pTexelBufferView), iter_count); if (!val->pTexelBufferView) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkBufferView_lookup(dec, &((VkBufferView *)val->pTexelBufferView)[i]); diff --git a/src/venus/venus-protocol/vn_protocol_renderer_transport.h b/src/venus/venus-protocol/vn_protocol_renderer_transport.h index a0ef419..0278b99 100644 --- a/src/venus/venus-protocol/vn_protocol_renderer_transport.h +++ b/src/venus/venus-protocol/vn_protocol_renderer_transport.h @@ -257,7 +257,7 @@ static inline void vn_decode_vkExecuteCommandStreamsMESA_args_temp(struct vn_cs_ vn_decode_uint32_t(dec, &args->streamCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->streamCount); - args->pStreams = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pStreams) * iter_count); + args->pStreams = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pStreams), iter_count); if (!args->pStreams) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandStreamDescriptionMESA_temp(dec, &((VkCommandStreamDescriptionMESA *)args->pStreams)[i]); @@ -267,7 +267,7 @@ static inline void vn_decode_vkExecuteCommandStreamsMESA_args_temp(struct vn_cs_ } if (vn_peek_array_size(dec)) { const size_t array_size = vn_decode_array_size(dec, args->streamCount); - args->pReplyPositions = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pReplyPositions) * array_size); + args->pReplyPositions = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pReplyPositions), array_size); if (!args->pReplyPositions) return; vn_decode_size_t_array(dec, (size_t *)args->pReplyPositions, array_size); } else { @@ -277,7 +277,7 @@ static inline void vn_decode_vkExecuteCommandStreamsMESA_args_temp(struct vn_cs_ vn_decode_uint32_t(dec, &args->dependencyCount); if (vn_peek_array_size(dec)) { const uint32_t iter_count = vn_decode_array_size(dec, args->dependencyCount); - args->pDependencies = vn_cs_decoder_alloc_temp(dec, sizeof(*args->pDependencies) * iter_count); + args->pDependencies = vn_cs_decoder_alloc_temp_array(dec, sizeof(*args->pDependencies), iter_count); if (!args->pDependencies) return; for (uint32_t i = 0; i < iter_count; i++) vn_decode_VkCommandStreamDependencyMESA_temp(dec, &((VkCommandStreamDependencyMESA *)args->pDependencies)[i]); |