Skip to content

Commit 8e64ce1

Browse files
ErichDonGublerErichDonGubler
committed
Deploying to master from @ gfx-rs/wgpu@3eb1bd5 🚀
1 parent 8d9a4cb commit 8e64ce1

File tree

9 files changed

+49
-41
lines changed

9 files changed

+49
-41
lines changed

‎doc/search-index.js‎

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

‎doc/src/wgpu_core/device/resource.rs.html‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3855,7 +3855,11 @@
38553855
<a href="#3854" id="3854">3854</a>
38563856
<a href="#3855" id="3855">3855</a>
38573857
<a href="#3856" id="3856">3856</a>
3858-
<a href="#3857" id="3857">3857</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
3858+
<a href="#3857" id="3857">3857</a>
3859+
<a href="#3858" id="3858">3858</a>
3860+
<a href="#3859" id="3859">3859</a>
3861+
<a href="#3860" id="3860">3860</a>
3862+
<a href="#3861" id="3861">3861</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
38593863
borrow::Cow,
38603864
boxed::Box,
38613865
string::{String, ToString <span class="kw">as _</span>},
@@ -5043,9 +5047,8 @@
50435047
}
50445048
};
50455049

5046-
<span class="kw">let </span>allowed_format_usages = <span class="self">self
5047-
</span>.describe_format_features(resolved_format)<span class="question-mark">?
5048-
</span>.allowed_usages;
5050+
<span class="kw">let </span>format_features = <span class="self">self</span>.describe_format_features(resolved_format)<span class="question-mark">?</span>;
5051+
<span class="kw">let </span>allowed_format_usages = format_features.allowed_usages;
50495052
<span class="kw">if </span>resolved_usage.contains(wgt::TextureUsages::RENDER_ATTACHMENT)
50505053
&amp;&amp; !allowed_format_usages.contains(wgt::TextureUsages::RENDER_ATTACHMENT)
50515054
{
@@ -5221,6 +5224,11 @@
52215224

52225225
<span class="comment">// filter the usages based on the other criteria
52235226
</span><span class="kw">let </span>usage = {
5227+
<span class="kw">let </span>resolved_hal_usage = conv::map_texture_usage(
5228+
resolved_usage,
5229+
resolved_format.into(),
5230+
format_features.flags,
5231+
);
52245232
<span class="kw">let </span>mask_copy = !(wgt::TextureUses::COPY_SRC | wgt::TextureUses::COPY_DST);
52255233
<span class="kw">let </span>mask_dimension = <span class="kw">match </span>resolved_dimension {
52265234
TextureViewDimension::Cube | TextureViewDimension::CubeArray =&gt; {
@@ -5239,7 +5247,7 @@
52395247
} <span class="kw">else </span>{
52405248
wgt::TextureUses::RESOURCE
52415249
};
5242-
texture.hal_usage &amp; mask_copy &amp; mask_dimension &amp; mask_mip_level
5250+
resolved_hal_usage &amp; mask_copy &amp; mask_dimension &amp; mask_mip_level
52435251
};
52445252

52455253
<span class="comment">// use the combined depth-stencil format for the view

‎doc/src/wgpu_core/resource.rs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3021,7 +3021,7 @@
30213021
<span class="kw">pub</span>(<span class="kw">crate</span>) inner: Snatchable&lt;TextureInner&gt;,
30223022
<span class="kw">pub</span>(<span class="kw">crate</span>) device: Arc&lt;Device&gt;,
30233023
<span class="kw">pub</span>(<span class="kw">crate</span>) desc: wgt::TextureDescriptor&lt;(), Vec&lt;wgt::TextureFormat&gt;&gt;,
3024-
<span class="kw">pub</span>(<span class="kw">crate</span>) hal_usage: wgt::TextureUses,
3024+
<span class="kw">pub</span>(<span class="kw">crate</span>) _hal_usage: wgt::TextureUses,
30253025
<span class="kw">pub</span>(<span class="kw">crate</span>) format_features: wgt::TextureFormatFeatures,
30263026
<span class="kw">pub</span>(<span class="kw">crate</span>) initialization_status: RwLock&lt;TextureInitTracker&gt;,
30273027
<span class="kw">pub</span>(<span class="kw">crate</span>) full_range: TextureSelector,
@@ -3047,7 +3047,7 @@
30473047
inner: Snatchable::new(inner),
30483048
device: device.clone(),
30493049
desc: desc.map_label(|<span class="kw">_</span>| ()),
3050-
hal_usage,
3050+
_hal_usage: hal_usage,
30513051
format_features,
30523052
initialization_status: RwLock::new(
30533053
rank::TEXTURE_INITIALIZATION_STATUS,

‎doc/wgpu_core/device/resource/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<!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 `resource` mod in crate `wgpu_core`."><title>wgpu_core::device::resource - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-46132b98.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.85.0 (4d91de4e4 2025-02-17)" data-channel="1.85.0" data-search-js="search-75f5ac3e.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="../sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.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" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><section id="rustdoc-toc"><h2 class="location"><a href="#">Module resource</a></h2><h3><a href="#structs">Module Items</a></h3><ul class="block"><li><a href="#structs" title="Structs">Structs</a></li><li><a href="#enums" title="Enums">Enums</a></li></ul></section><div id="rustdoc-modnav"><h2><a href="../index.html">In wgpu_<wbr>core::<wbr>device</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">device</a></span><h1>Module <span>resource</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/device/resource.rs.html#1-3857">Source</a> </span></div><h2 id="structs" class="section-header">Structs<a href="#structs" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.Device.html" title="struct wgpu_core::device::resource::Device">Device</a></div><div class="desc docblock-short">Structure describing a logical device. Some members are internally mutable,
1+
<!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 `resource` mod in crate `wgpu_core`."><title>wgpu_core::device::resource - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-46132b98.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.85.0 (4d91de4e4 2025-02-17)" data-channel="1.85.0" data-search-js="search-75f5ac3e.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="../sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.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" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><section id="rustdoc-toc"><h2 class="location"><a href="#">Module resource</a></h2><h3><a href="#structs">Module Items</a></h3><ul class="block"><li><a href="#structs" title="Structs">Structs</a></li><li><a href="#enums" title="Enums">Enums</a></li></ul></section><div id="rustdoc-modnav"><h2><a href="../index.html">In wgpu_<wbr>core::<wbr>device</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">device</a></span><h1>Module <span>resource</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/device/resource.rs.html#1-3861">Source</a> </span></div><h2 id="structs" class="section-header">Structs<a href="#structs" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.Device.html" title="struct wgpu_core::device::resource::Device">Device</a></div><div class="desc docblock-short">Structure describing a logical device. Some members are internally mutable,
22
stored behind mutexes.</div></li></ul><h2 id="enums" class="section-header">Enums<a href="#enums" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="enum" href="enum.DeferredDestroy.html" title="enum wgpu_core::device::resource::DeferredDestroy">Deferred<wbr>Destroy</a><span title="Restricted Visibility">&nbsp;🔒</span> </div></li></ul></section></div></main></body></html>

0 commit comments

Comments
 (0)