Deploying to master from @ gfx-rs/wgpu@ee35b0e 🚀

Author: ErichDonGubler

doc/search-index.js

@@ -1008,6 +1008,16 @@
 <a href="#1007" id="1007">1007</a>
 <a href="#1008" id="1008">1008</a>
 <a href="#1009" id="1009">1009</a>
+<a href="#1010" id="1010">1010</a>
+<a href="#1011" id="1011">1011</a>
+<a href="#1012" id="1012">1012</a>
+<a href="#1013" id="1013">1013</a>
+<a href="#1014" id="1014">1014</a>
+<a href="#1015" id="1015">1015</a>
+<a href="#1016" id="1016">1016</a>
+<a href="#1017" id="1017">1017</a>
+<a href="#1018" id="1018">1018</a>
+<a href="#1019" id="1019">1019</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     device::{
         bgl, Device, DeviceError, MissingDownlevelFlags, MissingFeatures, SHADER_STAGE_COUNT,
@@ -1894,6 +1904,16 @@
     }
 }
 
+<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>buffer_binding_type_bounds_check_alignment(
+    alignments: <span class="kw-2">&amp;</span>hal::Alignments,
+    binding_type: wgt::BufferBindingType,
+) -&gt; wgt::BufferAddress {
+    <span class="kw">match </span>binding_type {
+        wgt::BufferBindingType::Uniform =&gt; alignments.uniform_bounds_check_alignment.get(),
+        wgt::BufferBindingType::Storage { .. } =&gt; wgt::COPY_BUFFER_ALIGNMENT,
+    }
+}
+
 <span class="attr">#[derive(Debug)]
 </span><span class="kw">pub struct </span>BindGroup {
     <span class="kw">pub</span>(<span class="kw">crate</span>) raw: Snatchable&lt;Box&lt;<span class="kw">dyn </span>hal::DynBindGroup&gt;&gt;,

doc/src/wgpu_core/binding_model.rs.html

@@ -2473,6 +2473,9 @@
 <a href="#2472" id="2472">2472</a>
 <a href="#2473" id="2473">2473</a>
 <a href="#2474" id="2474">2474</a>
+<a href="#2475" id="2475">2475</a>
+<a href="#2476" id="2476">2476</a>
+<a href="#2477" id="2477">2477</a>
 </pre></div><pre class="rust"><code><span class="attr">#[cfg(feature = <span class="string">"trace"</span>)]
 </span><span class="kw">use </span><span class="kw">crate</span>::device::trace;
 <span class="kw">use crate</span>::{
@@ -3270,14 +3273,14 @@
                 <span class="prelude-val">Err</span>(..) =&gt; <span class="kw">break </span><span class="lifetime">'error </span>binding_model::CreateBindGroupError::InvalidLayout,
             };
 
-            <span class="kw">fn </span>map_entry&lt;<span class="lifetime">'a</span>&gt;(
+            <span class="kw">fn </span>resolve_entry&lt;<span class="lifetime">'a</span>&gt;(
                 e: <span class="kw-2">&amp;</span>BindGroupEntry&lt;<span class="lifetime">'a</span>&gt;,
                 buffer_storage: <span class="kw-2">&amp;</span>Storage&lt;resource::Buffer&gt;,
                 sampler_storage: <span class="kw-2">&amp;</span>Storage&lt;resource::Sampler&gt;,
                 texture_view_storage: <span class="kw-2">&amp;</span>Storage&lt;resource::TextureView&gt;,
             ) -&gt; <span class="prelude-ty">Result</span>&lt;ResolvedBindGroupEntry&lt;<span class="lifetime">'a</span>&gt;, binding_model::CreateBindGroupError&gt;
             {
-                <span class="kw">let </span>map_buffer = |bb: <span class="kw-2">&amp;</span>BufferBinding| {
+                <span class="kw">let </span>resolve_buffer = |bb: <span class="kw-2">&amp;</span>BufferBinding| {
                     buffer_storage
                         .get_owned(bb.buffer_id)
                         .map(|buffer| ResolvedBufferBinding {
@@ -3289,42 +3292,45 @@
                             binding_model::CreateBindGroupError::InvalidBufferId(bb.buffer_id)
                         })
                 };
-                <span class="kw">let </span>map_sampler = |id: <span class="kw-2">&amp;</span>id::SamplerId| {
+                <span class="kw">let </span>resolve_sampler = |id: <span class="kw-2">&amp;</span>id::SamplerId| {
                     sampler_storage
                         .get_owned(<span class="kw-2">*</span>id)
                         .map_err(|<span class="kw">_</span>| binding_model::CreateBindGroupError::InvalidSamplerId(<span class="kw-2">*</span>id))
                 };
-                <span class="kw">let </span>map_view = |id: <span class="kw-2">&amp;</span>id::TextureViewId| {
+                <span class="kw">let </span>resolve_view = |id: <span class="kw-2">&amp;</span>id::TextureViewId| {
                     texture_view_storage
                         .get_owned(<span class="kw-2">*</span>id)
                         .map_err(|<span class="kw">_</span>| binding_model::CreateBindGroupError::InvalidTextureViewId(<span class="kw-2">*</span>id))
                 };
                 <span class="kw">let </span>resource = <span class="kw">match </span>e.resource {
                     BindingResource::Buffer(<span class="kw-2">ref </span>buffer) =&gt; {
-                        ResolvedBindingResource::Buffer(map_buffer(buffer)<span class="question-mark">?</span>)
+                        ResolvedBindingResource::Buffer(resolve_buffer(buffer)<span class="question-mark">?</span>)
                     }
                     BindingResource::BufferArray(<span class="kw-2">ref </span>buffers) =&gt; {
                         <span class="kw">let </span>buffers = buffers
                             .iter()
-                            .map(map_buffer)
+                            .map(resolve_buffer)
                             .collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()<span class="question-mark">?</span>;
                         ResolvedBindingResource::BufferArray(Cow::Owned(buffers))
                     }
                     BindingResource::Sampler(<span class="kw-2">ref </span>sampler) =&gt; {
-                        ResolvedBindingResource::Sampler(map_sampler(sampler)<span class="question-mark">?</span>)
+                        ResolvedBindingResource::Sampler(resolve_sampler(sampler)<span class="question-mark">?</span>)
                     }
                     BindingResource::SamplerArray(<span class="kw-2">ref </span>samplers) =&gt; {
                         <span class="kw">let </span>samplers = samplers
                             .iter()
-                            .map(map_sampler)
+                            .map(resolve_sampler)
                             .collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()<span class="question-mark">?</span>;
                         ResolvedBindingResource::SamplerArray(Cow::Owned(samplers))
                     }
                     BindingResource::TextureView(<span class="kw-2">ref </span>view) =&gt; {
-                        ResolvedBindingResource::TextureView(map_view(view)<span class="question-mark">?</span>)
+                        ResolvedBindingResource::TextureView(resolve_view(view)<span class="question-mark">?</span>)
                     }
                     BindingResource::TextureViewArray(<span class="kw-2">ref </span>views) =&gt; {
-                        <span class="kw">let </span>views = views.iter().map(map_view).collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()<span class="question-mark">?</span>;
+                        <span class="kw">let </span>views = views
+                            .iter()
+                            .map(resolve_view)
+                            .collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()<span class="question-mark">?</span>;
                         ResolvedBindingResource::TextureViewArray(Cow::Owned(views))
                     }
                 };
@@ -3340,7 +3346,7 @@
                 <span class="kw">let </span>sampler_guard = hub.samplers.read();
                 desc.entries
                     .iter()
-                    .map(|e| map_entry(e, <span class="kw-2">&amp;</span>buffer_guard, <span class="kw-2">&amp;</span>sampler_guard, <span class="kw-2">&amp;</span>texture_view_guard))
+                    .map(|e| resolve_entry(e, <span class="kw-2">&amp;</span>buffer_guard, <span class="kw-2">&amp;</span>sampler_guard, <span class="kw-2">&amp;</span>texture_view_guard))
                     .collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()
             };
             <span class="kw">let </span>entries = <span class="kw">match </span>entries {

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

@@ -3664,6 +3664,13 @@
 <a href="#3663" id="3663">3663</a>
 <a href="#3664" id="3664">3664</a>
 <a href="#3665" id="3665">3665</a>
+<a href="#3666" id="3666">3666</a>
+<a href="#3667" id="3667">3667</a>
+<a href="#3668" id="3668">3668</a>
+<a href="#3669" id="3669">3669</a>
+<a href="#3670" id="3670">3670</a>
+<a href="#3671" id="3671">3671</a>
+<a href="#3672" id="3672">3672</a>
 </pre></div><pre class="rust"><code><span class="attr">#[cfg(feature = <span class="string">"trace"</span>)]
 </span><span class="kw">use </span><span class="kw">crate</span>::device::trace;
 <span class="kw">use crate</span>::{
@@ -3705,7 +3712,9 @@
 
 <span class="kw">use </span>smallvec::SmallVec;
 <span class="kw">use </span>thiserror::Error;
-<span class="kw">use </span>wgt::{DeviceLostReason, TextureFormat, TextureSampleType, TextureViewDimension};
+<span class="kw">use </span>wgt::{
+    math::align_to, DeviceLostReason, TextureFormat, TextureSampleType, TextureViewDimension,
+};
 
 <span class="kw">use </span>std::{
     borrow::Cow,
@@ -5295,7 +5304,7 @@
 
     <span class="doccomment">/// Generate information about late-validated buffer bindings for pipelines.
     </span><span class="comment">//TODO: should this be combined with `get_introspection_bind_group_layouts` in some way?
-    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>make_late_sized_buffer_groups(
+    </span><span class="kw">fn </span>make_late_sized_buffer_groups(
         shader_binding_sizes: <span class="kw-2">&amp;</span>FastHashMap&lt;naga::ResourceBinding, wgt::BufferSize&gt;,
         layout: <span class="kw-2">&amp;</span>binding_model::PipelineLayout,
     ) -&gt; ArrayVec&lt;pipeline::LateSizedBufferGroup, { hal::MAX_BIND_GROUPS }&gt; {
@@ -5547,16 +5556,15 @@
         <span class="prelude-val">Ok</span>(bgl)
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>create_buffer_binding&lt;<span class="lifetime">'a</span>&gt;(
-        <span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
+    <span class="kw">fn </span>create_buffer_binding&lt;<span class="lifetime">'a</span>&gt;(
+        <span class="kw-2">&amp;</span><span class="self">self</span>,
         bb: <span class="kw-2">&amp;</span><span class="lifetime">'a </span>binding_model::ResolvedBufferBinding,
         binding: u32,
         decl: <span class="kw-2">&amp;</span>wgt::BindGroupLayoutEntry,
         used_buffer_ranges: <span class="kw-2">&amp;mut </span>Vec&lt;BufferInitTrackerAction&gt;,
         dynamic_binding_info: <span class="kw-2">&amp;mut </span>Vec&lt;binding_model::BindGroupDynamicBindingData&gt;,
         late_buffer_binding_sizes: <span class="kw-2">&amp;mut </span>FastHashMap&lt;u32, wgt::BufferSize&gt;,
         used: <span class="kw-2">&amp;mut </span>BindGroupStates,
-        limits: <span class="kw-2">&amp;</span>wgt::Limits,
         snatch_guard: <span class="kw-2">&amp;</span><span class="lifetime">'a </span>SnatchGuard&lt;<span class="lifetime">'a</span>&gt;,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;hal::BufferBinding&lt;<span class="lifetime">'a</span>, <span class="kw">dyn </span>hal::DynBuffer&gt;, binding_model::CreateBindGroupError&gt;
     {
@@ -5581,7 +5589,7 @@
             wgt::BufferBindingType::Uniform =&gt; (
                 wgt::BufferUsages::UNIFORM,
                 hal::BufferUses::UNIFORM,
-                limits.max_uniform_buffer_binding_size,
+                <span class="self">self</span>.limits.max_uniform_buffer_binding_size,
             ),
             wgt::BufferBindingType::Storage { read_only } =&gt; (
                 wgt::BufferUsages::STORAGE,
@@ -5590,12 +5598,12 @@
                 } <span class="kw">else </span>{
                     hal::BufferUses::STORAGE_READ_WRITE
                 },
-                limits.max_storage_buffer_binding_size,
+                <span class="self">self</span>.limits.max_storage_buffer_binding_size,
             ),
         };
 
         <span class="kw">let </span>(align, align_limit_name) =
-            binding_model::buffer_binding_type_alignment(limits, binding_ty);
+            binding_model::buffer_binding_type_alignment(<span class="kw-2">&amp;</span><span class="self">self</span>.limits, binding_ty);
         <span class="kw">if </span>bb.offset % align <span class="kw">as </span>u64 != <span class="number">0 </span>{
             <span class="kw">return </span><span class="prelude-val">Err</span>(Error::UnalignedBufferOffset(
                 bb.offset,
@@ -5671,10 +5679,21 @@
             late_buffer_binding_sizes.insert(binding, late_size);
         }
 
-        <span class="macro">assert_eq!</span>(bb.offset % wgt::COPY_BUFFER_ALIGNMENT, <span class="number">0</span>);
+        <span class="comment">// This was checked against the device's alignment requirements above,
+        // which should always be a multiple of `COPY_BUFFER_ALIGNMENT`.
+        </span><span class="macro">assert_eq!</span>(bb.offset % wgt::COPY_BUFFER_ALIGNMENT, <span class="number">0</span>);
+
+        <span class="comment">// `wgpu_hal` only restricts shader access to bound buffer regions with
+        // a certain resolution. For the sake of lazy initialization, round up
+        // the size of the bound range to reflect how much of the buffer is
+        // actually going to be visible to the shader.
+        </span><span class="kw">let </span>bounds_check_alignment =
+            binding_model::buffer_binding_type_bounds_check_alignment(<span class="kw-2">&amp;</span><span class="self">self</span>.alignments, binding_ty);
+        <span class="kw">let </span>visible_size = align_to(bind_size, bounds_check_alignment);
+
         used_buffer_ranges.extend(buffer.initialization_status.read().create_action(
             buffer,
-            bb.offset..bb.offset + bind_size,
+            bb.offset..bb.offset + visible_size,
             MemoryInitKind::NeedsInitializedMemory,
         ));
 
@@ -5686,7 +5705,7 @@
     }
 
     <span class="kw">fn </span>create_sampler_binding&lt;<span class="lifetime">'a</span>&gt;(
-        <span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
+        <span class="kw-2">&amp;</span><span class="self">self</span>,
         used: <span class="kw-2">&amp;mut </span>BindGroupStates,
         binding: u32,
         decl: <span class="kw-2">&amp;</span>wgt::BindGroupLayoutEntry,
@@ -5734,8 +5753,8 @@
         <span class="prelude-val">Ok</span>(sampler.raw())
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>create_texture_binding&lt;<span class="lifetime">'a</span>&gt;(
-        <span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
+    <span class="kw">fn </span>create_texture_binding&lt;<span class="lifetime">'a</span>&gt;(
+        <span class="kw-2">&amp;</span><span class="self">self</span>,
         binding: u32,
         decl: <span class="kw-2">&amp;</span>wgt::BindGroupLayoutEntry,
         view: <span class="kw-2">&amp;</span><span class="lifetime">'a </span>Arc&lt;TextureView&gt;,
@@ -5833,7 +5852,6 @@
                         <span class="kw-2">&amp;mut </span>dynamic_binding_info,
                         <span class="kw-2">&amp;mut </span>late_buffer_binding_sizes,
                         <span class="kw-2">&amp;mut </span>used,
-                        <span class="kw-2">&amp;</span><span class="self">self</span>.limits,
                         <span class="kw-2">&amp;</span>snatch_guard,
                     )<span class="question-mark">?</span>;
 
@@ -5855,7 +5873,6 @@
                             <span class="kw-2">&amp;mut </span>dynamic_binding_info,
                             <span class="kw-2">&amp;mut </span>late_buffer_binding_sizes,
                             <span class="kw-2">&amp;mut </span>used,
-                            <span class="kw-2">&amp;</span><span class="self">self</span>.limits,
                             <span class="kw-2">&amp;</span>snatch_guard,
                         )<span class="question-mark">?</span>;
                         hal_buffers.push(bb);
@@ -5991,7 +6008,7 @@
         <span class="prelude-val">Ok</span>(bind_group)
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>check_array_binding(
+    <span class="kw">fn </span>check_array_binding(
         features: wgt::Features,
         count: <span class="prelude-ty">Option</span>&lt;NonZeroU32&gt;,
         num_bindings: usize,
@@ -6024,8 +6041,8 @@
         <span class="prelude-val">Ok</span>(())
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>texture_use_parameters(
-        <span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
+    <span class="kw">fn </span>texture_use_parameters(
+        <span class="kw-2">&amp;</span><span class="self">self</span>,
         binding: u32,
         decl: <span class="kw-2">&amp;</span>wgt::BindGroupLayoutEntry,
         view: <span class="kw-2">&amp;</span>TextureView,
@@ -7115,10 +7132,7 @@
         <span class="prelude-val">Ok</span>(cache)
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>get_texture_format_features(
-        <span class="kw-2">&amp;</span><span class="self">self</span>,
-        format: TextureFormat,
-    ) -&gt; wgt::TextureFormatFeatures {
+    <span class="kw">fn </span>get_texture_format_features(<span class="kw-2">&amp;</span><span class="self">self</span>, format: TextureFormat) -&gt; wgt::TextureFormatFeatures {
         <span class="comment">// Variant of adapter.get_texture_format_features that takes device features into account
         </span><span class="kw">use </span>wgt::TextureFormatFeatureFlags <span class="kw">as </span>tfsc;
         <span class="kw">let </span><span class="kw-2">mut </span>format_features = <span class="self">self</span>.adapter.get_texture_format_features(format);
@@ -7132,7 +7146,7 @@
         format_features
     }
 
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>describe_format_features(
+    <span class="kw">fn </span>describe_format_features(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         format: TextureFormat,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;wgt::TextureFormatFeatures, MissingFeatures&gt; {

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

@@ -1946,8 +1946,8 @@
         }
     }
 
-    <span class="kw">fn </span>same_device(<span class="kw-2">&amp;</span><span class="self">self</span>, device: <span class="kw-2">&amp;</span>Arc&lt;Device&gt;) -&gt; <span class="prelude-ty">Result</span>&lt;(), DeviceError&gt; {
-        <span class="kw">if </span>Arc::ptr_eq(<span class="self">self</span>.device(), device) {
+    <span class="kw">fn </span>same_device(<span class="kw-2">&amp;</span><span class="self">self</span>, device: <span class="kw-2">&amp;</span>Device) -&gt; <span class="prelude-ty">Result</span>&lt;(), DeviceError&gt; {
+        <span class="kw">if </span>std::ptr::eq(<span class="kw-2">&amp;**</span><span class="self">self</span>.device(), device) {
             <span class="prelude-val">Ok</span>(())
         } <span class="kw">else </span>{
             <span class="prelude-val">Err</span>(DeviceError::DeviceMismatch(Box::new(DeviceMismatch {