commit b9725fc20379a66f5eec1cc0253bc659002e8a01
author Joe Hermaszewski <git@monoid.al> Mon Apr 06 19:38:02 2020 +0800
committer Joe Hermaszewski <git@monoid.al> Tue Apr 07 20:21:28 2020 +0800
tree d88b592f952d2d00c2bea18ceaf57b7a09800c25
parent 3a756282ab6f708347329d0001dca3568bbfc7dd

Annotate types with lengths instead of parameters/members

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index b09d718..6f3a1b0 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -3133,8 +3133,8 @@
     const VkMemoryRequirements* VMA_NOT_NULL pVkMemoryRequirements,

     const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,

     size_t allocationCount,

-    VmaAllocation VMA_NULLABLE * VMA_NOT_NULL pAllocations VMA_LEN_IF_NOT_NULL(allocationCount),

-    VmaAllocationInfo* VMA_NULLABLE pAllocationInfo VMA_LEN_IF_NOT_NULL(allocationCount));

+    VmaAllocation VMA_NULLABLE * VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations,

+    VmaAllocationInfo* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationInfo);

 

 /**

 @param[out] pAllocation Handle to allocated memory.

@@ -3178,7 +3178,7 @@
 VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(

     VmaAllocator VMA_NOT_NULL allocator,

     size_t allocationCount,

-    const VmaAllocation VMA_NULLABLE * VMA_NOT_NULL pAllocations VMA_LEN_IF_NOT_NULL(allocationCount));

+    const VmaAllocation VMA_NULLABLE * VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations);

 

 /** \brief Deprecated.

 

@@ -3418,13 +3418,13 @@
     It is safe to pass allocations that are in the lost state - they are ignored.

     All allocations not present in this array are considered non-moveable during this defragmentation.

     */

-    VmaAllocation VMA_NOT_NULL * VMA_NOT_NULL pAllocations VMA_LEN_IF_NOT_NULL(allocationCount);

+    VmaAllocation VMA_NOT_NULL * VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations;

     /** \brief Optional, output. Pointer to array that will be filled with information whether the allocation at certain index has been changed during defragmentation.

 

     The array should have `allocationCount` elements.

     You can pass null if you are not interested in this information.

     */

-    VkBool32* VMA_NULLABLE pAllocationsChanged VMA_LEN_IF_NOT_NULL(allocationCount);

+    VkBool32* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationsChanged;

     /** \brief Numer of pools in `pPools` array.

     */

     uint32_t poolCount;

@@ -3443,7 +3443,7 @@
     Using this array is equivalent to specifying all allocations from the pools in `pAllocations`.

     It might be more efficient.

     */

-    VmaPool VMA_NOT_NULL * VMA_NULLABLE pPools VMA_LEN_IF_NOT_NULL(poolCount);

+    VmaPool VMA_NOT_NULL * VMA_NULLABLE VMA_LEN_IF_NOT_NULL(poolCount) pPools;

     /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on CPU side, like `memcpy()`, `memmove()`.

     

     `VK_WHOLE_SIZE` means no limit.

@@ -3487,7 +3487,7 @@
 */

 typedef struct VmaDefragmentationPassInfo {

     uint32_t moveCount;

-    VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pMoves VMA_LEN_IF_NOT_NULL(moveCount);

+    VmaDefragmentationPassMoveInfo* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(moveCount) pMoves;

 } VmaDefragmentationPassInfo;

 

 /** \brief Deprecated. Optional configuration parameters to be passed to function vmaDefragment().

@@ -3615,9 +3615,9 @@
 */

 VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragment(

     VmaAllocator VMA_NOT_NULL allocator,

-    VmaAllocation VMA_NOT_NULL * VMA_NOT_NULL pAllocations VMA_LEN_IF_NOT_NULL(allocationCount),

+    VmaAllocation VMA_NOT_NULL * VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations,

     size_t allocationCount,

-    VkBool32* VMA_NULLABLE pAllocationsChanged VMA_LEN_IF_NOT_NULL(allocationCount),

+    VkBool32* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationsChanged,

     const VmaDefragmentationInfo* VMA_NULLABLE pDefragmentationInfo,

     VmaDefragmentationStats* VMA_NULLABLE pDefragmentationStats);