Skip to content

Commit 71db590

Browse files
Merge branch 'sparse_binding_example' into v2.2
# Conflicts: # docs/html/vk__mem__alloc_8h_source.html # src/Tests.cpp # src/VmaReplay/VmaReplay.cpp # src/VulkanSample.cpp # src/vk_mem_alloc.h
2 parents 5c8af7b + 2e900ca commit 71db590

15 files changed

+1501
-132
lines changed

bin/SparseBindingTest.comp.spv

1.87 KB
Binary file not shown.

docs/Recording file format.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ No parameters.
152152

153153
- allocation : pointer
154154

155+
**vmaFreeMemoryPages** (min format version: 1.5)
156+
157+
- allocations : list of pointers
158+
155159
**vmaCreateLostAllocation** (min format version 1.2)
156160

157161
- allocation (output) : pointer
@@ -170,6 +174,20 @@ No parameters.
170174
- allocation (output) : pointer
171175
- allocationCreateInfo.pUserData : string (may contain additional commas)
172176

177+
**vmaAllocateMemoryPages** (min format version 1.5)
178+
179+
- vkMemoryRequirements.size : uint64
180+
- vkMemoryRequirements.alignment : uint64
181+
- vkMemoryRequirements.memoryTypeBits : uint32
182+
- allocationCreateInfo.flags : uint32
183+
- allocationCreateInfo.usage : uint32
184+
- allocationCreateInfo.requiredFlags : uint32
185+
- allocationCreateInfo.preferredFlags : uint32
186+
- allocationCreateInfo.memoryTypeBits : uint32
187+
- allocationCreateInfo.pool : pointer
188+
- allocations (output) : list of pointers
189+
- allocationCreateInfo.pUserData : string (may contain additional commas)
190+
173191
**vmaAllocateMemoryForBuffer, vmaAllocateMemoryForImage** (min format version 1.2)
174192

175193
- vkMemoryRequirements.size : uint64

docs/html/globals.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ <h3><a id="index_v"></a>- v -</h3><ul>
195195
<li>vmaAllocateMemoryForImage()
196196
: <a class="el" href="vk__mem__alloc_8h.html#a0faa3f9e5fb233d29d1e00390650febb">vk_mem_alloc.h</a>
197197
</li>
198+
<li>vmaAllocateMemoryPages()
199+
: <a class="el" href="vk__mem__alloc_8h.html#ad37e82e492b3de38fc3f4cffd9ad0ae1">vk_mem_alloc.h</a>
200+
</li>
198201
<li>VmaAllocationCreateFlagBits
199202
: <a class="el" href="vk__mem__alloc_8h.html#ad9889c10c798b040d59c92f257cae597">vk_mem_alloc.h</a>
200203
</li>
@@ -303,6 +306,9 @@ <h3><a id="index_v"></a>- v -</h3><ul>
303306
<li>vmaFreeMemory()
304307
: <a class="el" href="vk__mem__alloc_8h.html#a11f0fbc034fa81a4efedd73d61ce7568">vk_mem_alloc.h</a>
305308
</li>
309+
<li>vmaFreeMemoryPages()
310+
: <a class="el" href="vk__mem__alloc_8h.html#ab9e709de044c5d8476bea77a4e755840">vk_mem_alloc.h</a>
311+
</li>
306312
<li>vmaFreeStatsString()
307313
: <a class="el" href="vk__mem__alloc_8h.html#a3104eb30d8122c84dd8541063f145288">vk_mem_alloc.h</a>
308314
</li>

docs/html/globals_func.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ <h3><a id="index_v"></a>- v -</h3><ul>
7373
<li>vmaAllocateMemoryForImage()
7474
: <a class="el" href="vk__mem__alloc_8h.html#a0faa3f9e5fb233d29d1e00390650febb">vk_mem_alloc.h</a>
7575
</li>
76+
<li>vmaAllocateMemoryPages()
77+
: <a class="el" href="vk__mem__alloc_8h.html#ad37e82e492b3de38fc3f4cffd9ad0ae1">vk_mem_alloc.h</a>
78+
</li>
7679
<li>vmaBindBufferMemory()
7780
: <a class="el" href="vk__mem__alloc_8h.html#a6b0929b914b60cf2d45cac4bf3547470">vk_mem_alloc.h</a>
7881
</li>
@@ -142,6 +145,9 @@ <h3><a id="index_v"></a>- v -</h3><ul>
142145
<li>vmaFreeMemory()
143146
: <a class="el" href="vk__mem__alloc_8h.html#a11f0fbc034fa81a4efedd73d61ce7568">vk_mem_alloc.h</a>
144147
</li>
148+
<li>vmaFreeMemoryPages()
149+
: <a class="el" href="vk__mem__alloc_8h.html#ab9e709de044c5d8476bea77a4e755840">vk_mem_alloc.h</a>
150+
</li>
145151
<li>vmaFreeStatsString()
146152
: <a class="el" href="vk__mem__alloc_8h.html#a3104eb30d8122c84dd8541063f145288">vk_mem_alloc.h</a>
147153
</li>

docs/html/search/all_10.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/search/functions_0.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)