Skip to content

Commit 3b074ce

Browse files
jlacroixAMDjlacroixAMD
authored
Merge pull request #80 from sawickiap/master
Miscellaneous minor fixes
2 parents 330170f + f4f5899 commit 3b074ce

File tree

116 files changed

+2303
-3007
lines changed

Some content is hidden

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

116 files changed

+2303
-3007
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.1)
3+
project(D3D12MemoryAllocator VERSION 3.0.2)
44

55
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
66

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Easy to integrate memory allocation library for Direct3D 12.
88

99
**Changelog:** See [CHANGELOG.md](CHANGELOG.md)
1010

11-
**Product page:** [D3D12 Memory Allocator on GPUOpen](https://gpuopen.com/gaming-product/d3d12-memory-allocator/)
11+
**Product page:** [D3D12 Memory Allocator on GPUOpen](https://gpuopen.com/d3d12-memory-allocator/)
1212

1313
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.svg)](http://isitmaintained.com/project/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator "Average time to resolve an issue")
1414

‎docs/html/_d3_d12_mem_alloc_8h.html‎

Lines changed: 50 additions & 107 deletions
Large diffs are not rendered by default.

‎docs/html/annotated.html‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
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.2"/>
6+
<meta name="generator" content="Doxygen 1.14.0"/>
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"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
1212
<script type="text/javascript" src="clipboard.js"></script>
13-
<link href="navtree.css" rel="stylesheet" type="text/css"/>
14-
<script type="text/javascript" src="resize.js"></script>
1513
<script type="text/javascript" src="cookie.js"></script>
1614
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1715
<script type="text/javascript" src="search/searchdata.js"></script>
@@ -33,35 +31,24 @@
3331
</table>
3432
</div>
3533
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.2 -->
34+
<!-- Generated by Doxygen 1.14.0 -->
3735
<script type="text/javascript">
38-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3936
var searchBox = new SearchBox("searchBox", "search/",'.html');
40-
/* @license-end */
4137
</script>
4238
<script type="text/javascript">
43-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
44-
$(function() { codefold.init(0); });
45-
/* @license-end */
39+
$(function() { codefold.init(); });
4640
</script>
4741
<script type="text/javascript" src="menudata.js"></script>
4842
<script type="text/javascript" src="menu.js"></script>
4943
<script type="text/javascript">
50-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
5144
$(function() {
5245
initMenu('',true,false,'search.php','Search',false);
5346
$(function() { init_search(); });
5447
});
55-
/* @license-end */
5648
</script>
5749
<div id="main-nav"></div>
5850
</div><!-- top -->
5951
<div id="doc-content">
60-
<script type="text/javascript">
61-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
62-
$(function(){ initResizable(false); });
63-
/* @license-end */
64-
</script>
6552
<!-- window showing the filter options -->
6653
<div id="MSearchSelectWindow"
6754
onmouseover="return searchBox.OnSearchSelectShow()"
@@ -89,11 +76,11 @@
8976
<div class="contents">
9077
<div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><div class="directory">
9178
<div class="levels">[detail level <span onclick="javascript:dynsection.toggleLevel(1);">1</span><span onclick="javascript:dynsection.toggleLevel(2);">2</span>]</div><table class="directory">
92-
<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="dynsection.toggleFolder('0_')">&#9660;</span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespace_d3_d12_m_a.html" target="_self">D3D12MA</a></td><td class="desc"></td></tr>
79+
<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="dynsection.toggleFolder('0_')"><span class="arrowhead opened"></span></span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespace_d3_d12_m_a.html" target="_self">D3D12MA</a></td><td class="desc"></td></tr>
9380
<tr id="row_0_0_" class="odd"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_d3_d12_m_a_1_1_allocation.html" target="_self">Allocation</a></td><td class="desc">Represents single memory allocation </td></tr>
9481
<tr id="row_0_1_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_d3_d12_m_a_1_1_a_l_l_o_c_a_t_i_o_n___c_a_l_l_b_a_c_k_s.html" target="_self">ALLOCATION_CALLBACKS</a></td><td class="desc">Custom callbacks to CPU memory allocation functions </td></tr>
9582
<tr id="row_0_2_" class="odd"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_d3_d12_m_a_1_1_a_l_l_o_c_a_t_i_o_n___d_e_s_c.html" target="_self">ALLOCATION_DESC</a></td><td class="desc">Parameters of created <a class="el" href="class_d3_d12_m_a_1_1_allocation.html" title="Represents single memory allocation.">D3D12MA::Allocation</a> object. To be used with <a class="el" href="class_d3_d12_m_a_1_1_allocator.html#aa37d6b9fe8ea0864f7a35b9d68e8345a" title="Allocates memory and creates a D3D12 resource (buffer or texture). This is the main allocation functi...">Allocator::CreateResource</a> </td></tr>
96-
<tr id="row_0_3_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_d3_d12_m_a_1_1_allocator.html" target="_self">Allocator</a></td><td class="desc">Represents main object of this library initialized for particular <code>ID3D12Device</code> </td></tr>
83+
<tr id="row_0_3_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_d3_d12_m_a_1_1_allocator.html" target="_self">Allocator</a></td><td class="desc">Represents main object of this library initialized for particular <span class="tt">ID3D12Device</span> </td></tr>
9784
<tr id="row_0_4_" class="odd"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_d3_d12_m_a_1_1_a_l_l_o_c_a_t_o_r___d_e_s_c.html" target="_self">ALLOCATOR_DESC</a></td><td class="desc">Parameters of created <a class="el" href="class_d3_d12_m_a_1_1_allocator.html" title="Represents main object of this library initialized for particular ID3D12Device.">Allocator</a> object. To be used with <a class="el" href="namespace_d3_d12_m_a.html#ab7a1cd1683986d75ce1488b0920f4cb0" title="Creates new main D3D12MA::Allocator object and returns it through ppAllocator.">CreateAllocator()</a> </td></tr>
9885
<tr id="row_0_5_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_d3_d12_m_a_1_1_budget.html" target="_self">Budget</a></td><td class="desc">Statistics of current memory usage and available budget for a specific memory segment group </td></tr>
9986
<tr id="row_0_6_" class="odd"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_d3_d12_m_a_1_1_c_a_l_l_o_c_a_t_i_o_n___d_e_s_c.html" target="_self">CALLOCATION_DESC</a></td><td class="desc">Helper structure that helps with complete and conscise initialization of the <a class="el" href="struct_d3_d12_m_a_1_1_a_l_l_o_c_a_t_i_o_n___d_e_s_c.html" title="Parameters of created D3D12MA::Allocation object. To be used with Allocator::CreateResource.">D3D12MA::ALLOCATION_DESC</a> structure </td></tr>
@@ -120,7 +107,7 @@
120107
</div><!-- contents -->
121108
<!-- start footer part -->
122109
<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.2
110+
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.14.0
124111
</small></address>
125112
</div><!-- doc-content -->
126113
</body>

‎docs/html/class_d3_d12_m_a_1_1_allocation-members.html‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
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.2"/>
6+
<meta name="generator" content="Doxygen 1.14.0"/>
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"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
1212
<script type="text/javascript" src="clipboard.js"></script>
13-
<link href="navtree.css" rel="stylesheet" type="text/css"/>
14-
<script type="text/javascript" src="resize.js"></script>
1513
<script type="text/javascript" src="cookie.js"></script>
1614
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1715
<script type="text/javascript" src="search/searchdata.js"></script>
@@ -33,33 +31,22 @@
3331
</table>
3432
</div>
3533
<!-- end header part -->
36-
<!-- Generated by Doxygen 1.13.2 -->
34+
<!-- Generated by Doxygen 1.14.0 -->
3735
<script type="text/javascript">
38-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
3936
var searchBox = new SearchBox("searchBox", "search/",'.html');
40-
/* @license-end */
4137
</script>
4238
<script type="text/javascript">
43-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
44-
$(function() { codefold.init(0); });
45-
/* @license-end */
39+
$(function() { codefold.init(); });
4640
</script>
4741
<script type="text/javascript" src="menudata.js"></script>
4842
<script type="text/javascript" src="menu.js"></script>
4943
<script type="text/javascript">
50-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
5144
$(function() {
5245
initMenu('',true,false,'search.php','Search',false);
5346
$(function() { init_search(); });
5447
});
55-
/* @license-end */
5648
</script>
5749
<div id="main-nav"></div>
58-
<script type="text/javascript">
59-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
60-
$(function(){ initResizable(false); });
61-
/* @license-end */
62-
</script>
6350
<!-- window showing the filter options -->
6451
<div id="MSearchSelectWindow"
6552
onmouseover="return searchBox.OnSearchSelectShow()"
@@ -83,7 +70,7 @@
8370

8471
<div id="nav-path" class="navpath">
8572
<ul>
86-
<li class="navelem"><a class="el" href="namespace_d3_d12_m_a.html">D3D12MA</a></li><li class="navelem"><a class="el" href="class_d3_d12_m_a_1_1_allocation.html">Allocation</a></li> </ul>
73+
<li class="navelem"><a href="namespace_d3_d12_m_a.html">D3D12MA</a></li><li class="navelem"><a href="class_d3_d12_m_a_1_1_allocation.html">Allocation</a></li> </ul>
8774
</div>
8875
</div><!-- top -->
8976
<div id="doc-content">
@@ -117,7 +104,7 @@
117104
</table></div><!-- contents -->
118105
<!-- start footer part -->
119106
<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.2
107+
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.14.0
121108
</small></address>
122109
</div><!-- doc-content -->
123110
</body>

0 commit comments

Comments
 (0)