Skip to content

Commit bdb89a9

Browse files
Final fixes before v2.2.0 release. Minor fixes after tests. Rebuilt binaries and documentation again.
1 parent 1a8424f commit bdb89a9

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

bin/VmaReplay_Release_vs2017.exe

0 Bytes
Binary file not shown.

bin/VulkanSample_Release_vs2017.exe

0 Bytes
Binary file not shown.

docs/html/vk__mem__alloc_8h.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ad37e82e492b3de38fc3f4cff
12851285
<tr><td class="paramdir"></td><td class="paramname">pCreateInfo</td><td>Creation parameters for each alloction. </td></tr>
12861286
<tr><td class="paramdir"></td><td class="paramname">allocationCount</td><td>Number of allocations to make. </td></tr>
12871287
<tr><td class="paramdir">[out]</td><td class="paramname">pAllocations</td><td>Pointer to array that will be filled with handles to created allocations. </td></tr>
1288-
<tr><td class="paramdir">[out]</td><td class="paramname">pAlocationInfo</td><td>Optional. Pointer to array that will be filled with parameters of created allocations.</td></tr>
1288+
<tr><td class="paramdir">[out]</td><td class="paramname">pAllocationInfo</td><td>Optional. Pointer to array that will be filled with parameters of created allocations.</td></tr>
12891289
</table>
12901290
</dd>
12911291
</dl>
@@ -1873,10 +1873,10 @@ <h2 class="memtitle"><span class="permalink"><a href="#a36ba776fd7fd5cb1e9359fdc
18731873
<p>Begins defragmentation process. </p>
18741874
<dl class="params"><dt>Parameters</dt><dd>
18751875
<table class="params">
1876-
<tr><td class="paramname">allocator</td><td>Allocator object. </td></tr>
1877-
<tr><td class="paramname">pInfo</td><td>Structure filled with parameters of defragmentation. </td></tr>
1878-
<tr><td class="paramname">pStats[out]</td><td>Optional. Statistics of defragmentation. You can pass null if you are not interested in this information. </td></tr>
1879-
<tr><td class="paramname">pContext[out]</td><td>Context object that must be passed to <a class="el" href="vk__mem__alloc_8h.html#a8774e20e91e245aae959ba63efa15dd2" title="Ends defragmentation process. ">vmaDefragmentationEnd()</a> to finish defragmentation. </td></tr>
1876+
<tr><td class="paramdir"></td><td class="paramname">allocator</td><td>Allocator object. </td></tr>
1877+
<tr><td class="paramdir"></td><td class="paramname">pInfo</td><td>Structure filled with parameters of defragmentation. </td></tr>
1878+
<tr><td class="paramdir">[out]</td><td class="paramname">pStats</td><td>Optional. Statistics of defragmentation. You can pass null if you are not interested in this information. </td></tr>
1879+
<tr><td class="paramdir">[out]</td><td class="paramname">pContext</td><td>Context object that must be passed to <a class="el" href="vk__mem__alloc_8h.html#a8774e20e91e245aae959ba63efa15dd2" title="Ends defragmentation process. ">vmaDefragmentationEnd()</a> to finish defragmentation. </td></tr>
18801880
</table>
18811881
</dd>
18821882
</dl>

docs/html/vk__mem__alloc_8h_source.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/Tests.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ extern VkCommandBuffer g_hTemporaryCommandBuffer;
1313
void BeginSingleTimeCommands();
1414
void EndSingleTimeCommands();
1515

16+
#ifndef VMA_DEBUG_MARGIN
17+
#define VMA_DEBUG_MARGIN 0
18+
#endif
19+
1620
enum CONFIG_TYPE {
1721
CONFIG_TYPE_MINIMUM,
1822
CONFIG_TYPE_SMALL,
@@ -1379,6 +1383,7 @@ void TestDefragmentationSimple()
13791383
Allocation that must be move to an overlapping place using memmove().
13801384
Create 2 buffers, second slightly bigger than the first. Delete first. Then defragment.
13811385
*/
1386+
if(VMA_DEBUG_MARGIN == 0) // FAST algorithm works only when DEBUG_MARGIN disabled.
13821387
{
13831388
AllocInfo allocInfo[2];
13841389

src/vk_mem_alloc.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,7 +2499,7 @@ VkResult vmaAllocateMemory(
24992499
@param pCreateInfo Creation parameters for each alloction.
25002500
@param allocationCount Number of allocations to make.
25012501
@param[out] pAllocations Pointer to array that will be filled with handles to created allocations.
2502-
@param[out] pAlocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.
2502+
@param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.
25032503

25042504
You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().
25052505

@@ -2875,8 +2875,8 @@ typedef struct VmaDefragmentationStats {
28752875

28762876
@param allocator Allocator object.
28772877
@param pInfo Structure filled with parameters of defragmentation.
2878-
@param pStats[out] Optional. Statistics of defragmentation. You can pass null if you are not interested in this information.
2879-
@param pContext[out] Context object that must be passed to vmaDefragmentationEnd() to finish defragmentation.
2878+
@param[out] pStats Optional. Statistics of defragmentation. You can pass null if you are not interested in this information.
2879+
@param[out] pContext Context object that must be passed to vmaDefragmentationEnd() to finish defragmentation.
28802880
@return `VK_SUCCESS` and `*pContext == null` if defragmentation finished within this function call. `VK_NOT_READY` and `*pContext != null` if defragmentation has been started and you need to call vmaDefragmentationEnd() to finish it. Negative value in case of error.
28812881

28822882
Use this function instead of old, deprecated vmaDefragment().
@@ -6272,9 +6272,6 @@ class VmaDefragmentationAlgorithm_Fast : public VmaDefragmentationAlgorithm
62726272

62736273
struct VmaBlockDefragmentationContext
62746274
{
6275-
private:
6276-
VMA_CLASS_NO_COPY(VmaBlockDefragmentationContext)
6277-
public:
62786275
enum BLOCK_FLAG
62796276
{
62806277
BLOCK_FLAG_USED = 0x00000001,

0 commit comments

Comments
 (0)