Deploying to master from @ gfx-rs/wgpu@8cdbcc1 🚀

Author: jimblandy

doc/search-index.js

@@ -1105,7 +1105,27 @@
 <a href="#1104" id="1104">1104</a>
 <a href="#1105" id="1105">1105</a>
 <a href="#1106" id="1106">1106</a>
-<a href="#1107" id="1107">1107</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#1107" id="1107">1107</a>
+<a href="#1108" id="1108">1108</a>
+<a href="#1109" id="1109">1109</a>
+<a href="#1110" id="1110">1110</a>
+<a href="#1111" id="1111">1111</a>
+<a href="#1112" id="1112">1112</a>
+<a href="#1113" id="1113">1113</a>
+<a href="#1114" id="1114">1114</a>
+<a href="#1115" id="1115">1115</a>
+<a href="#1116" id="1116">1116</a>
+<a href="#1117" id="1117">1117</a>
+<a href="#1118" id="1118">1118</a>
+<a href="#1119" id="1119">1119</a>
+<a href="#1120" id="1120">1120</a>
+<a href="#1121" id="1121">1121</a>
+<a href="#1122" id="1122">1122</a>
+<a href="#1123" id="1123">1123</a>
+<a href="#1124" id="1124">1124</a>
+<a href="#1125" id="1125">1125</a>
+<a href="#1126" id="1126">1126</a>
+<a href="#1127" id="1127">1127</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::{Cow, ToOwned},
     boxed::Box,
     string::String,
@@ -1280,6 +1300,13 @@
     },
     <span class="attr">#[error(<span class="string">"Storage texture bindings must have a single mip level, but given a view with mip_level_count = {mip_level_count:?} at binding {binding}"</span>)]
     </span>InvalidStorageTextureMipLevelCount { binding: u32, mip_level_count: u32 },
+    <span class="attr">#[error(<span class="string">"External texture bindings must have a single mip level, but given a view with mip_level_count = {mip_level_count:?} at binding {binding}"</span>)]
+    </span>InvalidExternalTextureMipLevelCount { binding: u32, mip_level_count: u32 },
+    <span class="attr">#[error(<span class="string">"External texture bindings must have a format of `rgba8unorm`, `bgra8unorm`, or `rgba16float, but given a view with format = {format:?} at binding {binding}"</span>)]
+    </span>InvalidExternalTextureFormat {
+        binding: u32,
+        format: wgt::TextureFormat,
+    },
     <span class="attr">#[error(<span class="string">"Sampler binding {binding} expects comparison = {layout_cmp}, but given a sampler with comparison = {sampler_cmp}"</span>)]
     </span>WrongSamplerComparison {
         binding: u32,
@@ -1489,6 +1516,19 @@
                 wgt::BindingType::AccelerationStructure { .. } =&gt; {
                     <span class="self">self</span>.acceleration_structures.add(binding.visibility, count);
                 }
+                wgt::BindingType::ExternalTexture =&gt; {
+                    <span class="comment">// https://www.w3.org/TR/webgpu/#gpuexternaltexture
+                    // In order to account for many possible representations,
+                    // the binding conservatively uses the following, for each
+                    // external texture:
+                    // * Three sampled textures for up to 3 planes
+                    // * One additional sampled texture for a 3D LUT
+                    // * One sampler to sample the LUT
+                    // * One uniform buffer for metadata
+                    </span><span class="self">self</span>.sampled_textures.add(binding.visibility, count * <span class="number">4</span>);
+                    <span class="self">self</span>.samplers.add(binding.visibility, count);
+                    <span class="self">self</span>.uniform_buffers.add(binding.visibility, count);
+                }
             }
         }
     }

doc/search.desc/wgpu/wgpu-desc-0-.js

@@ -3941,7 +3941,50 @@
 <a href="#3940" id="3940">3940</a>
 <a href="#3941" id="3941">3941</a>
 <a href="#3942" id="3942">3942</a>
-<a href="#3943" id="3943">3943</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#3943" id="3943">3943</a>
+<a href="#3944" id="3944">3944</a>
+<a href="#3945" id="3945">3945</a>
+<a href="#3946" id="3946">3946</a>
+<a href="#3947" id="3947">3947</a>
+<a href="#3948" id="3948">3948</a>
+<a href="#3949" id="3949">3949</a>
+<a href="#3950" id="3950">3950</a>
+<a href="#3951" id="3951">3951</a>
+<a href="#3952" id="3952">3952</a>
+<a href="#3953" id="3953">3953</a>
+<a href="#3954" id="3954">3954</a>
+<a href="#3955" id="3955">3955</a>
+<a href="#3956" id="3956">3956</a>
+<a href="#3957" id="3957">3957</a>
+<a href="#3958" id="3958">3958</a>
+<a href="#3959" id="3959">3959</a>
+<a href="#3960" id="3960">3960</a>
+<a href="#3961" id="3961">3961</a>
+<a href="#3962" id="3962">3962</a>
+<a href="#3963" id="3963">3963</a>
+<a href="#3964" id="3964">3964</a>
+<a href="#3965" id="3965">3965</a>
+<a href="#3966" id="3966">3966</a>
+<a href="#3967" id="3967">3967</a>
+<a href="#3968" id="3968">3968</a>
+<a href="#3969" id="3969">3969</a>
+<a href="#3970" id="3970">3970</a>
+<a href="#3971" id="3971">3971</a>
+<a href="#3972" id="3972">3972</a>
+<a href="#3973" id="3973">3973</a>
+<a href="#3974" id="3974">3974</a>
+<a href="#3975" id="3975">3975</a>
+<a href="#3976" id="3976">3976</a>
+<a href="#3977" id="3977">3977</a>
+<a href="#3978" id="3978">3978</a>
+<a href="#3979" id="3979">3979</a>
+<a href="#3980" id="3980">3980</a>
+<a href="#3981" id="3981">3981</a>
+<a href="#3982" id="3982">3982</a>
+<a href="#3983" id="3983">3983</a>
+<a href="#3984" id="3984">3984</a>
+<a href="#3985" id="3985">3985</a>
+<a href="#3986" id="3986">3986</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::Cow,
     boxed::Box,
     string::{String, ToString <span class="kw">as _</span>},
@@ -5954,6 +5997,14 @@
                     )
                 }
                 Bt::AccelerationStructure { .. } =&gt; (<span class="prelude-val">None</span>, WritableStorage::No),
+                Bt::ExternalTexture =&gt; {
+                    <span class="self">self</span>.require_features(wgt::Features::EXTERNAL_TEXTURE)
+                        .map_err(|e| binding_model::CreateBindGroupLayoutError::Entry {
+                            binding: entry.binding,
+                            error: e.into(),
+                        })<span class="question-mark">?</span>;
+                    (<span class="prelude-val">None</span>, WritableStorage::No)
+                }
             };
 
             <span class="comment">// Validate the count parameter
@@ -6704,6 +6755,41 @@
                 view.check_usage(wgt::TextureUsages::STORAGE_BINDING)<span class="question-mark">?</span>;
                 <span class="prelude-val">Ok</span>(internal_use)
             }
+            wgt::BindingType::ExternalTexture =&gt; {
+                <span class="kw">if </span>view.desc.dimension != TextureViewDimension::D2 {
+                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::InvalidTextureDimension {
+                        binding,
+                        layout_dimension: TextureViewDimension::D2,
+                        view_dimension: view.desc.dimension,
+                    });
+                }
+                <span class="kw">let </span>mip_level_count = view.selector.mips.end - view.selector.mips.start;
+                <span class="kw">if </span>mip_level_count != <span class="number">1 </span>{
+                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::InvalidExternalTextureMipLevelCount {
+                        binding,
+                        mip_level_count,
+                    });
+                }
+                <span class="kw">if </span>view.desc.format != TextureFormat::Rgba8Unorm
+                    &amp;&amp; view.desc.format != TextureFormat::Bgra8Unorm
+                    &amp;&amp; view.desc.format != TextureFormat::Rgba16Float
+                {
+                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::InvalidExternalTextureFormat {
+                        binding,
+                        format: view.desc.format,
+                    });
+                }
+                <span class="kw">if </span>view.samples != <span class="number">1 </span>{
+                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::InvalidTextureMultisample {
+                        binding,
+                        layout_multisampled: <span class="bool-val">false</span>,
+                        view_samples: view.samples,
+                    });
+                }
+
+                view.check_usage(wgt::TextureUsages::TEXTURE_BINDING)<span class="question-mark">?</span>;
+                <span class="prelude-val">Ok</span>(wgt::TextureUses::RESOURCE)
+            }
             <span class="kw">_ </span>=&gt; <span class="prelude-val">Err</span>(Error::WrongBindingType {
                 binding,
                 actual: decl.ty,

doc/search.desc/wgpu/wgpu-desc-1-.js

@@ -1336,7 +1336,13 @@
 <a href="#1335" id="1335">1335</a>
 <a href="#1336" id="1336">1336</a>
 <a href="#1337" id="1337">1337</a>
-<a href="#1338" id="1338">1338</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#1338" id="1338">1338</a>
+<a href="#1339" id="1339">1339</a>
+<a href="#1340" id="1340">1340</a>
+<a href="#1341" id="1341">1341</a>
+<a href="#1342" id="1342">1342</a>
+<a href="#1343" id="1343">1343</a>
+<a href="#1344" id="1344">1344</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     boxed::Box,
     string::{String, ToString <span class="kw">as _</span>},
     vec::Vec,
@@ -1374,6 +1380,7 @@
     Texture,
     Sampler,
     AccelerationStructure,
+    ExternalTexture,
 }
 
 <span class="kw">impl </span>From&lt;<span class="kw-2">&amp;</span>ResourceType&gt; <span class="kw">for </span>BindingTypeName {
@@ -1395,6 +1402,7 @@
             BindingType::StorageTexture { .. } =&gt; BindingTypeName::Texture,
             BindingType::Sampler { .. } =&gt; BindingTypeName::Sampler,
             BindingType::AccelerationStructure { .. } =&gt; BindingTypeName::AccelerationStructure,
+            BindingType::ExternalTexture =&gt; BindingTypeName::ExternalTexture,
         }
     }
 }
@@ -1804,6 +1812,7 @@
                 <span class="kw">let </span>view_dimension = <span class="kw">match </span>entry.ty {
                     BindingType::Texture { view_dimension, .. }
                     | BindingType::StorageTexture { view_dimension, .. } =&gt; view_dimension,
+                    BindingType::ExternalTexture =&gt; wgt::TextureViewDimension::D2,
                     <span class="kw">_ </span>=&gt; {
                         <span class="kw">return </span><span class="prelude-val">Err</span>(BindingError::WrongTextureViewDimension {
                             dim,
@@ -2485,6 +2494,9 @@
                 );
                 <span class="kw">let </span>texture_sample_type = <span class="kw">match </span>texture_layout.ty {
                     BindingType::Texture { sample_type, .. } =&gt; sample_type,
+                    BindingType::ExternalTexture =&gt; {
+                        wgt::TextureSampleType::Float { filterable: <span class="bool-val">true </span>}
+                    }
                     <span class="kw">_ </span>=&gt; <span class="macro">unreachable!</span>(),
                 };
 

doc/search.desc/wgpu_types/wgpu_types-desc-0-.js

@@ -1643,7 +1643,9 @@
 <a href="#1642" id="1642">1642</a>
 <a href="#1643" id="1643">1643</a>
 <a href="#1644" id="1644">1644</a>
-<a href="#1645" id="1645">1645</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#1645" id="1645">1645</a>
+<a href="#1646" id="1646">1646</a>
+<a href="#1647" id="1647">1647</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::ToOwned, format, string::String, string::ToString <span class="kw">as _</span>, sync::Arc, vec, vec::Vec,
 };
 <span class="kw">use </span>core::{cmp::max, convert::TryInto, num::NonZeroU32, ptr, sync::atomic::Ordering};
@@ -2848,6 +2850,7 @@
                         ..
                     } =&gt; <span class="kw-2">&amp;mut </span>num_storage_buffers,
                     wgt::BindingType::AccelerationStructure { .. } =&gt; <span class="macro">unimplemented!</span>(),
+                    wgt::BindingType::ExternalTexture =&gt; <span class="macro">unimplemented!</span>(),
                 };
 
                 binding_to_slot[entry.binding <span class="kw">as </span>usize] = <span class="kw-2">*</span>counter;
@@ -2958,6 +2961,7 @@
                     })
                 }
                 wgt::BindingType::AccelerationStructure { .. } =&gt; <span class="macro">unimplemented!</span>(),
+                wgt::BindingType::ExternalTexture =&gt; <span class="macro">unimplemented!</span>(),
             };
             contents.push(binding);
         }

doc/src/wgpu_core/binding_model.rs.html

@@ -1006,7 +1006,8 @@
 <a href="#1005" id="1005">1005</a>
 <a href="#1006" id="1006">1006</a>
 <a href="#1007" id="1007">1007</a>
-<a href="#1008" id="1008">1008</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
+<a href="#1008" id="1008">1008</a>
+<a href="#1009" id="1009">1009</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
 
 <span class="kw">use </span>ash::vk;
 
@@ -1772,6 +1773,7 @@
         wgt::BindingType::AccelerationStructure { .. } =&gt; {
             vk::DescriptorType::ACCELERATION_STRUCTURE_KHR
         }
+        wgt::BindingType::ExternalTexture =&gt; <span class="macro">unimplemented!</span>(),
     }
 }
 

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

@@ -3102,7 +3102,8 @@
 <a href="#3101" id="3101">3101</a>
 <a href="#3102" id="3102">3102</a>
 <a href="#3103" id="3103">3103</a>
-<a href="#3104" id="3104">3104</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#3104" id="3104">3104</a>
+<a href="#3105" id="3105">3105</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::{Cow, ToOwned <span class="kw">as _</span>},
     collections::BTreeMap,
     ffi::CString,
@@ -4597,6 +4598,7 @@
                 wgt::BindingType::AccelerationStructure { .. } =&gt; {
                     desc_count.acceleration_structure += count;
                 }
+                wgt::BindingType::ExternalTexture =&gt; <span class="macro">unimplemented!</span>(),
             }
         }