Skip to content

Commit e108dfa

Browse files
teoxoyteoxoy
committed
Deploying to master from @ gfx-rs/wgpu@c0e3972 🚀
1 parent 1a205d2 commit e108dfa

File tree

135 files changed

+1371
-1072
lines changed

Some content is hidden

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

135 files changed

+1371
-1072
lines changed

‎doc/search-index.js‎

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

‎doc/src/wgpu/api/device.rs.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,6 @@
664664
<a href="#663" id="663">663</a>
665665
<a href="#664" id="664">664</a>
666666
<a href="#665" id="665">665</a>
667-
<a href="#666" id="666">666</a>
668-
<a href="#667" id="667">667</a>
669667
</pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt, future::Future, sync::Arc, thread};
670668

671669
<span class="kw">use </span>parking_lot::Mutex;
@@ -920,7 +918,6 @@
920918
Texture {
921919
context: Arc::clone(<span class="kw-2">&amp;</span><span class="self">self</span>.context),
922920
data,
923-
owned: <span class="bool-val">true</span>,
924921
descriptor: TextureDescriptor {
925922
label: <span class="prelude-val">None</span>,
926923
view_formats: <span class="kw-2">&amp;</span>[],
@@ -959,7 +956,6 @@
959956
Texture {
960957
context: Arc::clone(<span class="kw-2">&amp;</span><span class="self">self</span>.context),
961958
data: Box::new(texture),
962-
owned: <span class="bool-val">true</span>,
963959
descriptor: TextureDescriptor {
964960
label: <span class="prelude-val">None</span>,
965961
view_formats: <span class="kw-2">&amp;</span>[],

‎doc/src/wgpu/api/surface.rs.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@
404404
<a href="#403" id="403">403</a>
405405
<a href="#404" id="404">404</a>
406406
<a href="#405" id="405">405</a>
407-
<a href="#406" id="406">406</a>
408407
</pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt, sync::Arc, thread};
409408

410409
<span class="kw">use </span>parking_lot::Mutex;
@@ -549,7 +548,6 @@
549548
texture: Texture {
550549
context: Arc::clone(<span class="kw-2">&amp;</span><span class="self">self</span>.context),
551550
data,
552-
owned: <span class="bool-val">false</span>,
553551
descriptor,
554552
},
555553
suboptimal,

‎doc/src/wgpu/api/texture.rs.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
<a href="#151" id="151">151</a>
153153
<a href="#152" id="152">152</a>
154154
<a href="#153" id="153">153</a>
155-
<a href="#154" id="154">154</a>
156155
</pre></div><pre class="rust"><code><span class="kw">use </span>std::{sync::Arc, thread};
157156

158157
<span class="kw">use </span><span class="kw">crate</span>::context::DynContext;
@@ -167,7 +166,6 @@
167166
</span><span class="kw">pub struct </span>Texture {
168167
<span class="kw">pub</span>(<span class="kw">crate</span>) context: Arc&lt;C&gt;,
169168
<span class="kw">pub</span>(<span class="kw">crate</span>) data: Box&lt;Data&gt;,
170-
<span class="kw">pub</span>(<span class="kw">crate</span>) owned: bool,
171169
<span class="kw">pub</span>(<span class="kw">crate</span>) descriptor: TextureDescriptor&lt;<span class="lifetime">'static</span>&gt;,
172170
}
173171
<span class="attr">#[cfg(send_sync)]
@@ -293,7 +291,7 @@
293291

294292
<span class="kw">impl </span>Drop <span class="kw">for </span>Texture {
295293
<span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
296-
<span class="kw">if </span><span class="self">self</span>.owned &amp;&amp; !thread::panicking() {
294+
<span class="kw">if </span>!thread::panicking() {
297295
<span class="self">self</span>.context.texture_drop(<span class="self">self</span>.data.as_ref());
298296
}
299297
}

‎doc/src/wgpu_core/command/transfer.rs.html‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,8 +1153,6 @@
11531153
<a href="#1152" id="1152">1152</a>
11541154
<a href="#1153" id="1153">1153</a>
11551155
<a href="#1154" id="1154">1154</a>
1156-
<a href="#1155" id="1155">1155</a>
1157-
<a href="#1156" id="1156">1156</a>
11581156
</pre></div><pre class="rust"><code><span class="attr">#[cfg(feature = <span class="string">"trace"</span>)]
11591157
</span><span class="kw">use </span><span class="kw">crate</span>::device::trace::Command <span class="kw">as </span>TraceCommand;
11601158
<span class="kw">use crate</span>::{
@@ -1204,8 +1202,6 @@
12041202
</span>MissingBufferUsage(<span class="attr">#[from] </span>MissingBufferUsageError),
12051203
<span class="attr">#[error(transparent)]
12061204
</span>MissingTextureUsage(<span class="attr">#[from] </span>MissingTextureUsageError),
1207-
<span class="attr">#[error(<span class="string">"Destination texture is missing the `RENDER_ATTACHMENT` usage flag"</span>)]
1208-
</span>MissingRenderAttachmentUsageFlag(TextureId),
12091205
<span class="attr">#[error(<span class="string">"Copy of {start_offset}..{end_offset} would end up overrunning the bounds of the {side:?} buffer of size {buffer_size}"</span>)]
12101206
</span>BufferOverrun {
12111207
start_offset: BufferAddress,
@@ -1229,7 +1225,7 @@
12291225
<span class="attr">#[error(<span class="string">"Unable to select texture mip level {level} out of {total}"</span>)]
12301226
</span>InvalidTextureMipLevel { level: u32, total: u32 },
12311227
<span class="attr">#[error(<span class="string">"Texture dimension must be 2D when copying from an external texture"</span>)]
1232-
</span>InvalidDimensionExternal(TextureId),
1228+
</span>InvalidDimensionExternal,
12331229
<span class="attr">#[error(<span class="string">"Buffer offset {0} is not aligned to block size or `COPY_BUFFER_ALIGNMENT`"</span>)]
12341230
</span>UnalignedBufferOffset(BufferAddress),
12351231
<span class="attr">#[error(<span class="string">"Copy size {0} does not respect `COPY_BUFFER_ALIGNMENT`"</span>)]
@@ -1313,8 +1309,8 @@
13131309
}
13141310
}
13151311

1316-
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>extract_texture_selector(
1317-
copy_texture: <span class="kw-2">&amp;</span>ImageCopyTexture,
1312+
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>extract_texture_selector&lt;T&gt;(
1313+
copy_texture: <span class="kw-2">&amp;</span>wgt::ImageCopyTexture&lt;T&gt;,
13181314
copy_size: <span class="kw-2">&amp;</span>Extent3d,
13191315
texture: <span class="kw-2">&amp;</span>Texture,
13201316
) -&gt; <span class="prelude-ty">Result</span>&lt;(TextureSelector, hal::TextureCopyBase), TransferError&gt; {
@@ -1471,8 +1467,8 @@
14711467
/// Returns the HAL copy extent and the layer count.
14721468
///
14731469
/// [vtcr]: https://gpuweb.github.io/gpuweb/#validating-texture-copy-range
1474-
</span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>validate_texture_copy_range(
1475-
texture_copy_view: <span class="kw-2">&amp;</span>ImageCopyTexture,
1470+
</span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>validate_texture_copy_range&lt;T&gt;(
1471+
texture_copy_view: <span class="kw-2">&amp;</span>wgt::ImageCopyTexture&lt;T&gt;,
14761472
desc: <span class="kw-2">&amp;</span>wgt::TextureDescriptor&lt;(), Vec&lt;wgt::TextureFormat&gt;&gt;,
14771473
texture_side: CopySide,
14781474
copy_size: <span class="kw-2">&amp;</span>Extent3d,

0 commit comments

Comments
 (0)