Skip to content

Commit 580e22a

Browse files
jimblandyjimblandy
committed
Deploying to master from @ 27f6302d5bf98e0f9b5fc249e4ca99aab7a55a7c 🚀
1 parent 4c9dd22 commit 580e22a

File tree

3 files changed

+68
-64
lines changed

3 files changed

+68
-64
lines changed

‎doc/src/wgpu_hal/vulkan/command.rs.html

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -781,17 +781,10 @@
781781
<span id="781">781</span>
782782
<span id="782">782</span>
783783
<span id="783">783</span>
784-
<span id="784">784</span>
785-
<span id="785">785</span>
786-
<span id="786">786</span>
787-
<span id="787">787</span>
788-
<span id="788">788</span>
789-
<span id="789">789</span>
790784
</pre><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::conv;
791785

792786
<span class="kw">use </span>arrayvec::ArrayVec;
793787
<span class="kw">use </span>ash::{extensions::ext, vk};
794-
<span class="kw">use </span>inplace_it::inplace_or_alloc_from_iter;
795788

796789
<span class="kw">use </span>std::{mem, ops::Range, slice};
797790

@@ -997,11 +990,12 @@
997990
size: r.size.get(),
998991
});
999992

1000-
inplace_or_alloc_from_iter(vk_regions_iter, |vk_regions| {
1001-
<span class="self">self</span>.device
1002-
.raw
1003-
.cmd_copy_buffer(<span class="self">self</span>.active, src.raw, dst.raw, vk_regions)
1004-
})
993+
<span class="self">self</span>.device.raw.cmd_copy_buffer(
994+
<span class="self">self</span>.active,
995+
src.raw,
996+
dst.raw,
997+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::BufferCopy; <span class="number">32</span>]&gt;::from_iter(vk_regions_iter),
998+
);
1005999
}
10061000

10071001
<span class="kw">unsafe fn </span>copy_texture_to_texture&lt;T&gt;(
@@ -1033,16 +1027,14 @@
10331027
}
10341028
});
10351029

1036-
inplace_or_alloc_from_iter(vk_regions_iter, |vk_regions| {
1037-
<span class="self">self</span>.device.raw.cmd_copy_image(
1038-
<span class="self">self</span>.active,
1039-
src.raw,
1040-
src_layout,
1041-
dst.raw,
1042-
DST_IMAGE_LAYOUT,
1043-
vk_regions,
1044-
);
1045-
});
1030+
<span class="self">self</span>.device.raw.cmd_copy_image(
1031+
<span class="self">self</span>.active,
1032+
src.raw,
1033+
src_layout,
1034+
dst.raw,
1035+
DST_IMAGE_LAYOUT,
1036+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::ImageCopy; <span class="number">32</span>]&gt;::from_iter(vk_regions_iter),
1037+
);
10461038
}
10471039

10481040
<span class="kw">unsafe fn </span>copy_buffer_to_texture&lt;T&gt;(
@@ -1055,15 +1047,13 @@
10551047
{
10561048
<span class="kw">let </span>vk_regions_iter = dst.map_buffer_copies(regions);
10571049

1058-
inplace_or_alloc_from_iter(vk_regions_iter, |vk_regions| {
1059-
<span class="self">self</span>.device.raw.cmd_copy_buffer_to_image(
1060-
<span class="self">self</span>.active,
1061-
src.raw,
1062-
dst.raw,
1063-
DST_IMAGE_LAYOUT,
1064-
vk_regions,
1065-
);
1066-
});
1050+
<span class="self">self</span>.device.raw.cmd_copy_buffer_to_image(
1051+
<span class="self">self</span>.active,
1052+
src.raw,
1053+
dst.raw,
1054+
DST_IMAGE_LAYOUT,
1055+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::BufferImageCopy; <span class="number">32</span>]&gt;::from_iter(vk_regions_iter),
1056+
);
10671057
}
10681058

10691059
<span class="kw">unsafe fn </span>copy_texture_to_buffer&lt;T&gt;(
@@ -1078,15 +1068,13 @@
10781068
<span class="kw">let </span>src_layout = conv::derive_image_layout(src_usage, src.aspects);
10791069
<span class="kw">let </span>vk_regions_iter = src.map_buffer_copies(regions);
10801070

1081-
inplace_or_alloc_from_iter(vk_regions_iter, |vk_regions| {
1082-
<span class="self">self</span>.device.raw.cmd_copy_image_to_buffer(
1083-
<span class="self">self</span>.active,
1084-
src.raw,
1085-
src_layout,
1086-
dst.raw,
1087-
vk_regions,
1088-
);
1089-
});
1071+
<span class="self">self</span>.device.raw.cmd_copy_image_to_buffer(
1072+
<span class="self">self</span>.active,
1073+
src.raw,
1074+
src_layout,
1075+
dst.raw,
1076+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::BufferImageCopy; <span class="number">32</span>]&gt;::from_iter(vk_regions_iter),
1077+
);
10901078
}
10911079

10921080
<span class="kw">unsafe fn </span>begin_query(<span class="kw-2">&amp;mut </span><span class="self">self</span>, set: <span class="kw-2">&amp;</span><span class="kw">super</span>::QuerySet, index: u32) {

‎doc/src/wgpu_hal/vulkan/device.rs.html

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,11 +1919,18 @@
19191919
<span id="1919">1919</span>
19201920
<span id="1920">1920</span>
19211921
<span id="1921">1921</span>
1922+
<span id="1922">1922</span>
1923+
<span id="1923">1923</span>
1924+
<span id="1924">1924</span>
1925+
<span id="1925">1925</span>
1926+
<span id="1926">1926</span>
1927+
<span id="1927">1927</span>
1928+
<span id="1928">1928</span>
1929+
<span id="1929">1929</span>
19221930
</pre><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::conv;
19231931

19241932
<span class="kw">use </span>arrayvec::ArrayVec;
19251933
<span class="kw">use </span>ash::{extensions::khr, vk};
1926-
<span class="kw">use </span>inplace_it::inplace_or_alloc_from_iter;
19271934
<span class="kw">use </span>parking_lot::Mutex;
19281935

19291936
<span class="kw">use </span>std::{
@@ -2383,13 +2390,16 @@
23832390
layouts: <span class="kw">impl </span>ExactSizeIterator&lt;Item = <span class="kw-2">&amp;</span><span class="lifetime">&#39;a </span>vk::DescriptorSetLayout&gt;,
23842391
sets: <span class="kw-2">&amp;mut </span><span class="kw">impl </span>Extend&lt;vk::DescriptorSet&gt;,
23852392
) -&gt; <span class="prelude-ty">Result</span>&lt;(), gpu_descriptor::DeviceAllocationError&gt; {
2386-
<span class="kw">let </span>result = inplace_or_alloc_from_iter(layouts.cloned(), |layouts_slice| {
2387-
<span class="kw">let </span>vk_info = vk::DescriptorSetAllocateInfo::builder()
2393+
<span class="kw">let </span>result = <span class="self">self</span>.raw.allocate_descriptor_sets(
2394+
<span class="kw-2">&amp;</span>vk::DescriptorSetAllocateInfo::builder()
23882395
.descriptor_pool(<span class="kw-2">*</span>pool)
2389-
.set_layouts(layouts_slice)
2390-
.build();
2391-
<span class="self">self</span>.raw.allocate_descriptor_sets(<span class="kw-2">&amp;</span>vk_info)
2392-
});
2396+
.set_layouts(
2397+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::DescriptorSetLayout; <span class="number">32</span>]&gt;::from_iter(
2398+
layouts.cloned(),
2399+
),
2400+
)
2401+
.build(),
2402+
);
23932403

23942404
<span class="kw">match </span>result {
23952405
<span class="prelude-val">Ok</span>(vk_sets) =&gt; {
@@ -2418,9 +2428,10 @@
24182428
pool: <span class="kw-2">&amp;mut </span>vk::DescriptorPool,
24192429
sets: <span class="kw">impl </span>Iterator&lt;Item = vk::DescriptorSet&gt;,
24202430
) {
2421-
<span class="kw">let </span>result = inplace_or_alloc_from_iter(sets, |sets_slice| {
2422-
<span class="self">self</span>.raw.free_descriptor_sets(<span class="kw-2">*</span>pool, sets_slice)
2423-
});
2431+
<span class="kw">let </span>result = <span class="self">self</span>.raw.free_descriptor_sets(
2432+
<span class="kw-2">*</span>pool,
2433+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::DescriptorSet; <span class="number">32</span>]&gt;::from_iter(sets),
2434+
);
24242435
<span class="kw">match </span>result {
24252436
<span class="prelude-val">Ok</span>(()) =&gt; {}
24262437
<span class="prelude-val">Err</span>(err) =&gt; <span class="macro">log::error!</span>(<span class="string">&quot;free_descriptor_sets: {:?}&quot;</span>, err),
@@ -2748,21 +2759,26 @@
27482759
</span>I: Iterator&lt;Item = <span class="kw">crate</span>::MemoryRange&gt;,
27492760
{
27502761
<span class="kw">let </span>vk_ranges = <span class="self">self</span>.shared.make_memory_ranges(buffer, ranges);
2751-
inplace_or_alloc_from_iter(vk_ranges, |array| {
2752-
<span class="self">self</span>.shared.raw.flush_mapped_memory_ranges(array).unwrap()
2753-
});
2762+
2763+
<span class="self">self</span>.shared
2764+
.raw
2765+
.flush_mapped_memory_ranges(
2766+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::MappedMemoryRange; <span class="number">32</span>]&gt;::from_iter(vk_ranges),
2767+
)
2768+
.unwrap();
27542769
}
27552770
<span class="kw">unsafe fn </span>invalidate_mapped_ranges&lt;I&gt;(<span class="kw-2">&amp;</span><span class="self">self</span>, buffer: <span class="kw-2">&amp;</span><span class="kw">super</span>::Buffer, ranges: I)
27562771
<span class="kw">where
27572772
</span>I: Iterator&lt;Item = <span class="kw">crate</span>::MemoryRange&gt;,
27582773
{
27592774
<span class="kw">let </span>vk_ranges = <span class="self">self</span>.shared.make_memory_ranges(buffer, ranges);
2760-
inplace_or_alloc_from_iter(vk_ranges, |array| {
2761-
<span class="self">self</span>.shared
2762-
.raw
2763-
.invalidate_mapped_memory_ranges(array)
2764-
.unwrap()
2765-
});
2775+
2776+
<span class="self">self</span>.shared
2777+
.raw
2778+
.invalidate_mapped_memory_ranges(
2779+
<span class="kw-2">&amp;</span>smallvec::SmallVec::&lt;[vk::MappedMemoryRange; <span class="number">32</span>]&gt;::from_iter(vk_ranges),
2780+
)
2781+
.unwrap();
27662782
}
27672783

27682784
<span class="kw">unsafe fn </span>create_texture(
@@ -3044,7 +3060,7 @@
30443060
}
30453061
}
30463062

3047-
<span class="comment">//Note: not bothering with inplace_or_alloc_from_iter her as it&#39;s low frequency
3063+
<span class="comment">//Note: not bothering with on stack array here as it&#39;s low frequency
30483064
</span><span class="kw">let </span>vk_bindings = desc
30493065
.entries
30503066
.iter()
@@ -3156,7 +3172,7 @@
31563172
<span class="kw-2">&amp;</span><span class="self">self</span>,
31573173
desc: <span class="kw-2">&amp;</span><span class="kw">crate</span>::PipelineLayoutDescriptor&lt;<span class="kw">super</span>::Api&gt;,
31583174
) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">super</span>::PipelineLayout, <span class="kw">crate</span>::DeviceError&gt; {
3159-
<span class="comment">//Note: not bothering with inplace_or_alloc_from_iter her as it&#39;s low frequency
3175+
<span class="comment">//Note: not bothering with on stack array here as it&#39;s low frequency
31603176
</span><span class="kw">let </span>vk_set_layouts = desc
31613177
.bind_group_layouts
31623178
.iter()

0 commit comments

Comments
 (0)