Skip to content

Commit 1ca6a88

Browse files
Deploying to master from @ gfx-rs/wgpu@d0fd6a2 🚀
1 parent af8a6a2 commit 1ca6a88

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

doc/src/naga/back/glsl/mod.rs.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8410,13 +8410,13 @@
84108410
Mf::Transpose =&gt; <span class="string">"transpose"</span>,
84118411
Mf::Determinant =&gt; <span class="string">"determinant"</span>,
84128412
Mf::QuantizeToF16 =&gt; <span class="kw">match </span><span class="kw-2">*</span>ctx.resolve_type(arg, <span class="kw-2">&amp;</span><span class="self">self</span>.module.types) {
8413-
<span class="kw">crate</span>::TypeInner::Scalar { .. } =&gt; {
8413+
TypeInner::Scalar { .. } =&gt; {
84148414
<span class="macro">write!</span>(<span class="self">self</span>.out, <span class="string">"unpackHalf2x16(packHalf2x16(vec2("</span>)<span class="question-mark">?</span>;
84158415
<span class="self">self</span>.write_expr(arg, ctx)<span class="question-mark">?</span>;
84168416
<span class="macro">write!</span>(<span class="self">self</span>.out, <span class="string">"))).x"</span>)<span class="question-mark">?</span>;
84178417
<span class="kw">return </span><span class="prelude-val">Ok</span>(());
84188418
}
8419-
<span class="kw">crate</span>::TypeInner::Vector {
8419+
TypeInner::Vector {
84208420
size: <span class="kw">crate</span>::VectorSize::Bi,
84218421
..
84228422
} =&gt; {
@@ -8425,7 +8425,7 @@
84258425
<span class="macro">write!</span>(<span class="self">self</span>.out, <span class="string">"))"</span>)<span class="question-mark">?</span>;
84268426
<span class="kw">return </span><span class="prelude-val">Ok</span>(());
84278427
}
8428-
<span class="kw">crate</span>::TypeInner::Vector {
8428+
TypeInner::Vector {
84298429
size: <span class="kw">crate</span>::VectorSize::Tri,
84308430
..
84318431
} =&gt; {
@@ -8436,7 +8436,7 @@
84368436
<span class="macro">write!</span>(<span class="self">self</span>.out, <span class="string">".zz)).x)"</span>)<span class="question-mark">?</span>;
84378437
<span class="kw">return </span><span class="prelude-val">Ok</span>(());
84388438
}
8439-
<span class="kw">crate</span>::TypeInner::Vector {
8439+
TypeInner::Vector {
84408440
size: <span class="kw">crate</span>::VectorSize::Quad,
84418441
..
84428442
} =&gt; {

doc/src/wgpu_core/command/ray_tracing.rs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@
19751975
<span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">ref </span>staging_buffer) = staging_buffer {
19761976
cmd_buf_raw.transition_buffers(<span class="kw-2">&amp;</span>[hal::BufferBarrier::&lt;<span class="kw">dyn </span>hal::DynBuffer&gt; {
19771977
buffer: staging_buffer.raw(),
1978-
usage: hal::BufferUses::MAP_WRITE..hal::BufferUses::COPY_SRC,
1978+
usage: BufferUses::MAP_WRITE..BufferUses::COPY_SRC,
19791979
}]);
19801980
}
19811981
}
@@ -1997,7 +1997,7 @@
19971997
<span class="kw">unsafe </span>{
19981998
cmd_buf_raw.transition_buffers(<span class="kw-2">&amp;</span>[hal::BufferBarrier::&lt;<span class="kw">dyn </span>hal::DynBuffer&gt; {
19991999
buffer: tlas.instance_buffer.as_ref(),
2000-
usage: hal::BufferUses::MAP_READ..hal::BufferUses::COPY_DST,
2000+
usage: BufferUses::MAP_READ..BufferUses::COPY_DST,
20012001
}]);
20022002
<span class="kw">let </span>temp = hal::BufferCopy {
20032003
src_offset: range.start <span class="kw">as </span>u64,
@@ -2237,7 +2237,7 @@
22372237
}
22382238
<span class="kw">let </span>data = cmd_buf_data.trackers.buffers.set_single(
22392239
<span class="kw-2">&amp;</span>index_buffer,
2240-
hal::BufferUses::BOTTOM_LEVEL_ACCELERATION_STRUCTURE_INPUT,
2240+
BufferUses::BOTTOM_LEVEL_ACCELERATION_STRUCTURE_INPUT,
22412241
);
22422242
<span class="prelude-val">Some</span>((index_buffer.clone(), data))
22432243
} <span class="kw">else </span>{

doc/src/wgpu_core/ray_tracing.rs.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,6 @@
333333
<a href="#332" id="332">332</a>
334334
<a href="#333" id="333">333</a>
335335
<a href="#334" id="334">334</a>
336-
<a href="#335" id="335">335</a>
337-
<a href="#336" id="336">336</a>
338-
<a href="#337" id="337">337</a>
339336
</pre></div><pre class="rust"><code><span class="comment">// Ray tracing
340337
// Major missing optimizations (no api surface changes needed):
341338
// - use custom tracker to track build state
@@ -351,7 +348,7 @@
351348
id::{BlasId, BufferId, TlasId},
352349
resource::CreateBufferError,
353350
};
354-
<span class="kw">use </span>std::sync::Arc;
351+
<span class="kw">use </span>std::{mem::size_of, sync::Arc};
355352
<span class="kw">use </span>std::{num::NonZeroU64, slice};
356353

357354
<span class="kw">use </span><span class="kw">crate</span>::resource::{Blas, ResourceErrorIdent, Tlas};
@@ -663,11 +660,8 @@
663660
};
664661
<span class="kw">let </span>temp: <span class="kw-2">*const </span><span class="kw">_ </span>= <span class="kw-2">&amp;</span>temp;
665662
<span class="kw">unsafe </span>{
666-
slice::from_raw_parts::&lt;u8&gt;(
667-
temp.cast::&lt;u8&gt;(),
668-
std::mem::size_of::&lt;RawTlasInstance&gt;(),
669-
)
670-
.to_vec()
663+
slice::from_raw_parts::&lt;u8&gt;(temp.cast::&lt;u8&gt;(), size_of::&lt;RawTlasInstance&gt;())
664+
.to_vec()
671665
}
672666
}
673667
<span class="kw">_ </span>=&gt; <span class="macro">unimplemented!</span>(),

doc/src/wgpu_core/scratch.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
usage: BufferUses::ACCELERATION_STRUCTURE_SCRATCH,
6666
memory_flags: hal::MemoryFlags::empty(),
6767
})
68-
.map_err(<span class="kw">crate</span>::device::DeviceError::from_hal)<span class="question-mark">?
68+
.map_err(DeviceError::from_hal)<span class="question-mark">?
6969
</span>};
7070
<span class="prelude-val">Ok</span>(<span class="self">Self </span>{
7171
raw: ManuallyDrop::new(raw),
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `ray_tracing` mod in crate `wgpu_core`."><title>wgpu_core::ray_tracing - Rust</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../../static.files/SourceSerif4-Regular-46f98efaafac5295.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../static.files/FiraSans-Regular-018c141bf0843ffd.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../static.files/FiraSans-Medium-8f9a781e4970d388.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../static.files/SourceCodePro-Regular-562dcc5011b6de7d.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../static.files/SourceCodePro-Semibold-d899c5a5c4aeb14a.ttf.woff2"><link rel="stylesheet" href="../../static.files/normalize-76eba96aa4d2e634.css"><link rel="stylesheet" href="../../static.files/rustdoc-804b98a1284a310a.css"><meta name="rustdoc-vars" data-root-path="../../" data-static-root-path="../../static.files/" data-current-crate="wgpu_core" data-themes="" data-resource-suffix="" data-rustdoc-version="1.76.0-nightly (445177724 2023-12-16)" data-channel="nightly" data-search-js="search-874d56868bf05518.js" data-settings-js="settings-4313503d2e1961c2.js" ><script src="../../static.files/storage-f2adc0d6ca4d09fb.js"></script><script defer src="../sidebar-items.js"></script><script defer src="../../static.files/main-305769736d49e732.js"></script><noscript><link rel="stylesheet" href="../../static.files/noscript-feafe1bb7466e4bd.css"></noscript><link rel="alternate icon" type="image/png" href="../../static.files/favicon-16x16-8b506e7a72182f1c.png"><link rel="alternate icon" type="image/png" href="../../static.files/favicon-32x32-422f7d1d52889060.png"><link rel="icon" type="image/svg+xml" href="../../static.files/favicon-2c020d218678b618.svg"></head><body class="rustdoc mod"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle">&#9776;</button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../wgpu_core/index.html">wgpu_core</a><span class="version">23.0.0</span></h2></div><h2 class="location"><a href="#">Module ray_tracing</a></h2><div class="sidebar-elems"><section><ul class="block"><li><a href="#structs">Structs</a></li><li><a href="#enums">Enums</a></li></ul></section><h2><a href="../index.html">In crate wgpu_core</a></h2></div></nav><div class="sidebar-resizer"></div>
2-
<main><div class="width-limiter"><nav class="sub"><form class="search-form"><span></span><div id="sidebar-button" tabindex="-1"><a href="../../wgpu_core/all.html" title="show sidebar"></a></div><input class="search-input" name="search" aria-label="Run search in the documentation" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><div id="help-button" tabindex="-1"><a href="../../help.html" title="help">?</a></div><div id="settings-menu" tabindex="-1"><a href="../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../static.files/wheel-7b819b6101059cd0.svg"></a></div></form></nav><section id="main-content" class="content"><div class="main-heading"><h1>Module <a href="../index.html">wgpu_core</a>::<wbr><a class="mod" href="#">ray_tracing</a><button id="copy-path" title="Copy item path to clipboard"><img src="../../static.files/clipboard-7571035ce49a181d.svg" width="19" height="18" alt="Copy item path"></button></h1><span class="out-of-band"><a class="src" href="../../src/wgpu_core/ray_tracing.rs.html#10-337">source</a> · <button id="toggle-all-docs" title="collapse all docs">[<span>&#x2212;</span>]</button></span></div><h2 id="structs" class="section-header"><a href="#structs">Structs</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.BlasBuildEntry.html" title="struct wgpu_core::ray_tracing::BlasBuildEntry">BlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.BlasTriangleGeometry.html" title="struct wgpu_core::ray_tracing::BlasTriangleGeometry">BlasTriangleGeometry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasBuildEntry.html" title="struct wgpu_core::ray_tracing::TlasBuildEntry">TlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasInstance.html" title="struct wgpu_core::ray_tracing::TlasInstance">TlasInstance</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasPackage.html" title="struct wgpu_core::ray_tracing::TlasPackage">TlasPackage</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceBlasBuildEntry.html" title="struct wgpu_core::ray_tracing::TraceBlasBuildEntry">TraceBlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceBlasTriangleGeometry.html" title="struct wgpu_core::ray_tracing::TraceBlasTriangleGeometry">TraceBlasTriangleGeometry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceTlasInstance.html" title="struct wgpu_core::ray_tracing::TraceTlasInstance">TraceTlasInstance</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceTlasPackage.html" title="struct wgpu_core::ray_tracing::TraceTlasPackage">TraceTlasPackage</a></div></li></ul><h2 id="enums" class="section-header"><a href="#enums">Enums</a></h2><ul class="item-table"><li><div class="item-name"><a class="enum" href="enum.BlasGeometries.html" title="enum wgpu_core::ray_tracing::BlasGeometries">BlasGeometries</a></div></li><li><div class="item-name"><a class="enum" href="enum.BuildAccelerationStructureError.html" title="enum wgpu_core::ray_tracing::BuildAccelerationStructureError">BuildAccelerationStructureError</a></div><div class="desc docblock-short">Error encountered while attempting to do a copy on a command encoder.</div></li><li><div class="item-name"><a class="enum" href="enum.CreateBlasError.html" title="enum wgpu_core::ray_tracing::CreateBlasError">CreateBlasError</a></div></li><li><div class="item-name"><a class="enum" href="enum.CreateTlasError.html" title="enum wgpu_core::ray_tracing::CreateTlasError">CreateTlasError</a></div></li><li><div class="item-name"><a class="enum" href="enum.TraceBlasGeometries.html" title="enum wgpu_core::ray_tracing::TraceBlasGeometries">TraceBlasGeometries</a></div></li><li><div class="item-name"><a class="enum" href="enum.ValidateBlasActionsError.html" title="enum wgpu_core::ray_tracing::ValidateBlasActionsError">ValidateBlasActionsError</a></div></li><li><div class="item-name"><a class="enum" href="enum.ValidateTlasActionsError.html" title="enum wgpu_core::ray_tracing::ValidateTlasActionsError">ValidateTlasActionsError</a></div></li></ul></section></div></main></body></html>
2+
<main><div class="width-limiter"><nav class="sub"><form class="search-form"><span></span><div id="sidebar-button" tabindex="-1"><a href="../../wgpu_core/all.html" title="show sidebar"></a></div><input class="search-input" name="search" aria-label="Run search in the documentation" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><div id="help-button" tabindex="-1"><a href="../../help.html" title="help">?</a></div><div id="settings-menu" tabindex="-1"><a href="../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../static.files/wheel-7b819b6101059cd0.svg"></a></div></form></nav><section id="main-content" class="content"><div class="main-heading"><h1>Module <a href="../index.html">wgpu_core</a>::<wbr><a class="mod" href="#">ray_tracing</a><button id="copy-path" title="Copy item path to clipboard"><img src="../../static.files/clipboard-7571035ce49a181d.svg" width="19" height="18" alt="Copy item path"></button></h1><span class="out-of-band"><a class="src" href="../../src/wgpu_core/ray_tracing.rs.html#10-334">source</a> · <button id="toggle-all-docs" title="collapse all docs">[<span>&#x2212;</span>]</button></span></div><h2 id="structs" class="section-header"><a href="#structs">Structs</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.BlasBuildEntry.html" title="struct wgpu_core::ray_tracing::BlasBuildEntry">BlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.BlasTriangleGeometry.html" title="struct wgpu_core::ray_tracing::BlasTriangleGeometry">BlasTriangleGeometry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasBuildEntry.html" title="struct wgpu_core::ray_tracing::TlasBuildEntry">TlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasInstance.html" title="struct wgpu_core::ray_tracing::TlasInstance">TlasInstance</a></div></li><li><div class="item-name"><a class="struct" href="struct.TlasPackage.html" title="struct wgpu_core::ray_tracing::TlasPackage">TlasPackage</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceBlasBuildEntry.html" title="struct wgpu_core::ray_tracing::TraceBlasBuildEntry">TraceBlasBuildEntry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceBlasTriangleGeometry.html" title="struct wgpu_core::ray_tracing::TraceBlasTriangleGeometry">TraceBlasTriangleGeometry</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceTlasInstance.html" title="struct wgpu_core::ray_tracing::TraceTlasInstance">TraceTlasInstance</a></div></li><li><div class="item-name"><a class="struct" href="struct.TraceTlasPackage.html" title="struct wgpu_core::ray_tracing::TraceTlasPackage">TraceTlasPackage</a></div></li></ul><h2 id="enums" class="section-header"><a href="#enums">Enums</a></h2><ul class="item-table"><li><div class="item-name"><a class="enum" href="enum.BlasGeometries.html" title="enum wgpu_core::ray_tracing::BlasGeometries">BlasGeometries</a></div></li><li><div class="item-name"><a class="enum" href="enum.BuildAccelerationStructureError.html" title="enum wgpu_core::ray_tracing::BuildAccelerationStructureError">BuildAccelerationStructureError</a></div><div class="desc docblock-short">Error encountered while attempting to do a copy on a command encoder.</div></li><li><div class="item-name"><a class="enum" href="enum.CreateBlasError.html" title="enum wgpu_core::ray_tracing::CreateBlasError">CreateBlasError</a></div></li><li><div class="item-name"><a class="enum" href="enum.CreateTlasError.html" title="enum wgpu_core::ray_tracing::CreateTlasError">CreateTlasError</a></div></li><li><div class="item-name"><a class="enum" href="enum.TraceBlasGeometries.html" title="enum wgpu_core::ray_tracing::TraceBlasGeometries">TraceBlasGeometries</a></div></li><li><div class="item-name"><a class="enum" href="enum.ValidateBlasActionsError.html" title="enum wgpu_core::ray_tracing::ValidateBlasActionsError">ValidateBlasActionsError</a></div></li><li><div class="item-name"><a class="enum" href="enum.ValidateTlasActionsError.html" title="enum wgpu_core::ray_tracing::ValidateTlasActionsError">ValidateTlasActionsError</a></div></li></ul></section></div></main></body></html>

0 commit comments

Comments
 (0)