Skip to content

Commit 330170f

Browse files
jlacroixAMDjlacroixAMD
authored
Merge pull request #76 from sawickiap/master
Fix in Cmake script, improvement in documentation
2 parents 08af682 + 6e1b0b4 commit 330170f

File tree

175 files changed

+326
-3149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+326
-3149
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.25)
22

3-
project(D3D12MemoryAllocator VERSION 3.0.0)
3+
project(D3D12MemoryAllocator VERSION 3.0.1)
44

55
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
66

‎docs/html/_d3_d12_mem_alloc_8h.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8-
<title>D3D12 Memory Allocator: D:/PROJECTS/D3D12 Memory Allocator/REPO/include/D3D12MemAlloc.h File Reference</title>
8+
<title>D3D12 Memory Allocator: C:/Code/D3D12MemoryAllocator/REPO/include/D3D12MemAlloc.h File Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -407,7 +407,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ad04069a2e2bbc53b7d65f85a
407407
</div><!-- contents -->
408408
<!-- start footer part -->
409409
<hr class="footer"/><address class="footer"><small>
410-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
410+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
411411
</small></address>
412412
</div><!-- doc-content -->
413413
</body>

‎docs/html/annotated.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: Class List</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -120,7 +120,7 @@
120120
</div><!-- contents -->
121121
<!-- start footer part -->
122122
<hr class="footer"/><address class="footer"><small>
123-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
123+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
124124
</small></address>
125125
</div><!-- doc-content -->
126126
</body>

‎docs/html/bdwn.png‎

-147 Bytes
Binary file not shown.

‎docs/html/class_d3_d12_m_a_1_1_allocation-members.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: Member List</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -106,9 +106,9 @@
106106
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a92c2fb6f22b28817eb83a59407d7dd30">GetSize</a>() const</td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
107107
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a4e7380aabcac5b0a1cd833c5c84459c6">heap</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
108108
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#ab1f59d849add2cdbfbebf4eb98db5c97">list</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
109-
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a1bee33a7ad0294d5879b178e0608e495">m_Committed</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
110-
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#ae677cecc5479143c670287a1fe62008e">m_Heap</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
111-
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#ac8a15647f4825f0cf2daa1533e89509d">m_Placed</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
109+
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a38cff302aed26fbdc608f3e427976406">m_Committed</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
110+
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a305c5d36e2e332b74639818e5e2c3953">m_Heap</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
111+
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a22e7a16d3d430109affa474d23964c80">m_Placed</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
112112
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#a6f31560bc71451410a2a907b6d81b48f">next</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
113113
<tr class="even"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#adc3ac89758a915a409e047f9b89aa160">prev</a></td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
114114
<tr class="odd"><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html#af9e643276b577aa7f21937f75d4b82ac">SetName</a>(LPCWSTR Name)</td><td class="entry"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">D3D12MA::Allocation</a></td><td class="entry"></td></tr>
@@ -117,7 +117,7 @@
117117
</table></div><!-- contents -->
118118
<!-- start footer part -->
119119
<hr class="footer"/><address class="footer"><small>
120-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
120+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
121121
</small></address>
122122
</div><!-- doc-content -->
123123
</body>

‎docs/html/class_d3_d12_m_a_1_1_allocation.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: D3D12MA::Allocation Class Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -455,8 +455,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ab1f59d849add2cdbfbebf4eb
455455

456456
</div>
457457
</div>
458-
<a id="a1bee33a7ad0294d5879b178e0608e495" name="a1bee33a7ad0294d5879b178e0608e495"></a>
459-
<h2 class="memtitle"><span class="permalink"><a href="#a1bee33a7ad0294d5879b178e0608e495">&#9670;&#160;</a></span>[struct]</h2>
458+
<a id="a38cff302aed26fbdc608f3e427976406" name="a38cff302aed26fbdc608f3e427976406"></a>
459+
<h2 class="memtitle"><span class="permalink"><a href="#a38cff302aed26fbdc608f3e427976406">&#9670;&#160;</a></span>[struct]</h2>
460460

461461
<div class="memitem">
462462
<div class="memproto">
@@ -469,8 +469,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#a1bee33a7ad0294d5879b178e
469469

470470
</div>
471471
</div>
472-
<a id="ae677cecc5479143c670287a1fe62008e" name="ae677cecc5479143c670287a1fe62008e"></a>
473-
<h2 class="memtitle"><span class="permalink"><a href="#ae677cecc5479143c670287a1fe62008e">&#9670;&#160;</a></span>[struct]</h2>
472+
<a id="a305c5d36e2e332b74639818e5e2c3953" name="a305c5d36e2e332b74639818e5e2c3953"></a>
473+
<h2 class="memtitle"><span class="permalink"><a href="#a305c5d36e2e332b74639818e5e2c3953">&#9670;&#160;</a></span>[struct]</h2>
474474

475475
<div class="memitem">
476476
<div class="memproto">
@@ -483,8 +483,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ae677cecc5479143c670287a1
483483

484484
</div>
485485
</div>
486-
<a id="ac8a15647f4825f0cf2daa1533e89509d" name="ac8a15647f4825f0cf2daa1533e89509d"></a>
487-
<h2 class="memtitle"><span class="permalink"><a href="#ac8a15647f4825f0cf2daa1533e89509d">&#9670;&#160;</a></span>[struct]</h2>
486+
<a id="a22e7a16d3d430109affa474d23964c80" name="a22e7a16d3d430109affa474d23964c80"></a>
487+
<h2 class="memtitle"><span class="permalink"><a href="#a22e7a16d3d430109affa474d23964c80">&#9670;&#160;</a></span>[struct]</h2>
488488

489489
<div class="memitem">
490490
<div class="memproto">
@@ -526,12 +526,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#adc3ac89758a915a409e047f9
526526
</div>
527527
</div>
528528
<hr/>The documentation for this class was generated from the following file:<ul>
529-
<li>D:/PROJECTS/D3D12 Memory Allocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
529+
<li>C:/Code/D3D12MemoryAllocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
530530
</ul>
531531
</div><!-- contents -->
532532
<!-- start footer part -->
533533
<hr class="footer"/><address class="footer"><small>
534-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
534+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
535535
</small></address>
536536
</div><!-- doc-content -->
537537
</body>

‎docs/html/class_d3_d12_m_a_1_1_allocator-members.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: Member List</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -118,7 +118,7 @@
118118
</table></div><!-- contents -->
119119
<!-- start footer part -->
120120
<hr class="footer"/><address class="footer"><small>
121-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
121+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
122122
</small></address>
123123
</div><!-- doc-content -->
124124
</body>

‎docs/html/class_d3_d12_m_a_1_1_allocator.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: D3D12MA::Allocator Class Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -865,12 +865,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#a468ba0c93121eaaee402b087
865865
</div>
866866
</div>
867867
<hr/>The documentation for this class was generated from the following file:<ul>
868-
<li>D:/PROJECTS/D3D12 Memory Allocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
868+
<li>C:/Code/D3D12MemoryAllocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
869869
</ul>
870870
</div><!-- contents -->
871871
<!-- start footer part -->
872872
<hr class="footer"/><address class="footer"><small>
873-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
873+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
874874
</small></address>
875875
</div><!-- doc-content -->
876876
</body>

‎docs/html/class_d3_d12_m_a_1_1_defragmentation_context-members.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: Member List</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -101,7 +101,7 @@
101101
</table></div><!-- contents -->
102102
<!-- start footer part -->
103103
<hr class="footer"/><address class="footer"><small>
104-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
104+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
105105
</small></address>
106106
</div><!-- doc-content -->
107107
</body>

‎docs/html/class_d3_d12_m_a_1_1_defragmentation_context.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.13.0"/>
6+
<meta name="generator" content="Doxygen 1.13.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>D3D12 Memory Allocator: D3D12MA::DefragmentationContext Class Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -33,7 +33,7 @@
3333
</table>
3434
</div>
3535
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.0 -->
36+
<!-- Generated by Doxygen 1.13.2 -->
3737
<script type="text/javascript">
3838
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3939
var searchBox = new SearchBox("searchBox", "search/",'.html');
@@ -204,12 +204,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#a1c21c26f47dcbf8f4e562063
204204
</div>
205205
</div>
206206
<hr/>The documentation for this class was generated from the following file:<ul>
207-
<li>D:/PROJECTS/D3D12 Memory Allocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
207+
<li>C:/Code/D3D12MemoryAllocator/REPO/include/<a class="el" href="_d3_d12_mem_alloc_8h.html">D3D12MemAlloc.h</a></li>
208208
</ul>
209209
</div><!-- contents -->
210210
<!-- start footer part -->
211211
<hr class="footer"/><address class="footer"><small>
212-
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.0
212+
Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.2
213213
</small></address>
214214
</div><!-- doc-content -->
215215
</body>

0 commit comments

Comments
 (0)