Deploying to master from @ gfx-rs/wgpu@194d4b1 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -1073,7 +1073,39 @@
 <a href="#1072" id="1072">1072</a>
 <a href="#1073" id="1073">1073</a>
 <a href="#1074" id="1074">1074</a>
-<a href="#1075" id="1075">1075</a></pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
+<a href="#1075" id="1075">1075</a>
+<a href="#1076" id="1076">1076</a>
+<a href="#1077" id="1077">1077</a>
+<a href="#1078" id="1078">1078</a>
+<a href="#1079" id="1079">1079</a>
+<a href="#1080" id="1080">1080</a>
+<a href="#1081" id="1081">1081</a>
+<a href="#1082" id="1082">1082</a>
+<a href="#1083" id="1083">1083</a>
+<a href="#1084" id="1084">1084</a>
+<a href="#1085" id="1085">1085</a>
+<a href="#1086" id="1086">1086</a>
+<a href="#1087" id="1087">1087</a>
+<a href="#1088" id="1088">1088</a>
+<a href="#1089" id="1089">1089</a>
+<a href="#1090" id="1090">1090</a>
+<a href="#1091" id="1091">1091</a>
+<a href="#1092" id="1092">1092</a>
+<a href="#1093" id="1093">1093</a>
+<a href="#1094" id="1094">1094</a>
+<a href="#1095" id="1095">1095</a>
+<a href="#1096" id="1096">1096</a>
+<a href="#1097" id="1097">1097</a>
+<a href="#1098" id="1098">1098</a>
+<a href="#1099" id="1099">1099</a>
+<a href="#1100" id="1100">1100</a>
+<a href="#1101" id="1101">1101</a>
+<a href="#1102" id="1102">1102</a>
+<a href="#1103" id="1103">1103</a>
+<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 crate</span>::{
     device::{
         bgl, Device, DeviceError, MissingDownlevelFlags, MissingFeatures, SHADER_STAGE_COUNT,
     },
@@ -1304,6 +1336,8 @@
     StorageBuffers,
     StorageTextures,
     UniformBuffers,
+    BindingArrayElements,
+    BindingArraySamplerElements,
 }
 
 <span class="kw">impl </span>BindingTypeMaxCountErrorKind {
@@ -1324,6 +1358,12 @@
                 <span class="string">"max_storage_textures_per_shader_stage"
             </span>}
             BindingTypeMaxCountErrorKind::UniformBuffers =&gt; <span class="string">"max_uniform_buffers_per_shader_stage"</span>,
+            BindingTypeMaxCountErrorKind::BindingArrayElements =&gt; {
+                <span class="string">"max_binding_array_elements_per_shader_stage"
+            </span>}
+            BindingTypeMaxCountErrorKind::BindingArraySamplerElements =&gt; {
+                <span class="string">"max_binding_array_elements_per_shader_stage"
+            </span>}
         }
     }
 }
@@ -1398,49 +1438,59 @@
     storage_textures: PerStageBindingTypeCounter,
     uniform_buffers: PerStageBindingTypeCounter,
     acceleration_structures: PerStageBindingTypeCounter,
+    binding_array_elements: PerStageBindingTypeCounter,
+    binding_array_sampler_elements: PerStageBindingTypeCounter,
     has_bindless_array: bool,
 }
 
 <span class="kw">impl </span>BindingTypeMaxCountValidator {
     <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>add_binding(<span class="kw-2">&amp;mut </span><span class="self">self</span>, binding: <span class="kw-2">&amp;</span>wgt::BindGroupLayoutEntry) {
         <span class="kw">let </span>count = binding.count.map_or(<span class="number">1</span>, |count| count.get());
-        <span class="kw">match </span>binding.ty {
-            wgt::BindingType::Buffer {
-                ty: wgt::BufferBindingType::Uniform,
-                has_dynamic_offset,
-                ..
-            } =&gt; {
-                <span class="self">self</span>.uniform_buffers.add(binding.visibility, count);
-                <span class="kw">if </span>has_dynamic_offset {
-                    <span class="self">self</span>.dynamic_uniform_buffers += count;
-                }
+
+        <span class="kw">if </span>binding.count.is_some() {
+            <span class="self">self</span>.binding_array_elements.add(binding.visibility, count);
+            <span class="self">self</span>.has_bindless_array = <span class="bool-val">true</span>;
+
+            <span class="kw">if let </span>wgt::BindingType::Sampler(<span class="kw">_</span>) = binding.ty {
+                <span class="self">self</span>.binding_array_sampler_elements
+                    .add(binding.visibility, count);
             }
-            wgt::BindingType::Buffer {
-                ty: wgt::BufferBindingType::Storage { .. },
-                has_dynamic_offset,
-                ..
-            } =&gt; {
-                <span class="self">self</span>.storage_buffers.add(binding.visibility, count);
-                <span class="kw">if </span>has_dynamic_offset {
-                    <span class="self">self</span>.dynamic_storage_buffers += count;
+        } <span class="kw">else </span>{
+            <span class="kw">match </span>binding.ty {
+                wgt::BindingType::Buffer {
+                    ty: wgt::BufferBindingType::Uniform,
+                    has_dynamic_offset,
+                    ..
+                } =&gt; {
+                    <span class="self">self</span>.uniform_buffers.add(binding.visibility, count);
+                    <span class="kw">if </span>has_dynamic_offset {
+                        <span class="self">self</span>.dynamic_uniform_buffers += count;
+                    }
+                }
+                wgt::BindingType::Buffer {
+                    ty: wgt::BufferBindingType::Storage { .. },
+                    has_dynamic_offset,
+                    ..
+                } =&gt; {
+                    <span class="self">self</span>.storage_buffers.add(binding.visibility, count);
+                    <span class="kw">if </span>has_dynamic_offset {
+                        <span class="self">self</span>.dynamic_storage_buffers += count;
+                    }
+                }
+                wgt::BindingType::Sampler { .. } =&gt; {
+                    <span class="self">self</span>.samplers.add(binding.visibility, count);
+                }
+                wgt::BindingType::Texture { .. } =&gt; {
+                    <span class="self">self</span>.sampled_textures.add(binding.visibility, count);
+                }
+                wgt::BindingType::StorageTexture { .. } =&gt; {
+                    <span class="self">self</span>.storage_textures.add(binding.visibility, count);
+                }
+                wgt::BindingType::AccelerationStructure =&gt; {
+                    <span class="self">self</span>.acceleration_structures.add(binding.visibility, count);
                 }
-            }
-            wgt::BindingType::Sampler { .. } =&gt; {
-                <span class="self">self</span>.samplers.add(binding.visibility, count);
-            }
-            wgt::BindingType::Texture { .. } =&gt; {
-                <span class="self">self</span>.sampled_textures.add(binding.visibility, count);
-            }
-            wgt::BindingType::StorageTexture { .. } =&gt; {
-                <span class="self">self</span>.storage_textures.add(binding.visibility, count);
-            }
-            wgt::BindingType::AccelerationStructure =&gt; {
-                <span class="self">self</span>.acceleration_structures.add(binding.visibility, count);
             }
         }
-        <span class="kw">if </span>binding.count.is_some() {
-            <span class="self">self</span>.has_bindless_array = <span class="bool-val">true</span>;
-        }
     }
 
     <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>merge(<span class="kw-2">&amp;mut </span><span class="self">self</span>, other: <span class="kw-2">&amp;</span><span class="self">Self</span>) {
@@ -1451,6 +1501,12 @@
         <span class="self">self</span>.storage_buffers.merge(<span class="kw-2">&amp;</span>other.storage_buffers);
         <span class="self">self</span>.storage_textures.merge(<span class="kw-2">&amp;</span>other.storage_textures);
         <span class="self">self</span>.uniform_buffers.merge(<span class="kw-2">&amp;</span>other.uniform_buffers);
+        <span class="self">self</span>.acceleration_structures
+            .merge(<span class="kw-2">&amp;</span>other.acceleration_structures);
+        <span class="self">self</span>.binding_array_elements
+            .merge(<span class="kw-2">&amp;</span>other.binding_array_elements);
+        <span class="self">self</span>.binding_array_sampler_elements
+            .merge(<span class="kw-2">&amp;</span>other.binding_array_sampler_elements);
     }
 
     <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>validate(<span class="kw-2">&amp;</span><span class="self">self</span>, limits: <span class="kw-2">&amp;</span>wgt::Limits) -&gt; <span class="prelude-ty">Result</span>&lt;(), BindingTypeMaxCountError&gt; {
@@ -1490,6 +1546,14 @@
             limits.max_uniform_buffers_per_shader_stage,
             BindingTypeMaxCountErrorKind::UniformBuffers,
         )<span class="question-mark">?</span>;
+        <span class="self">self</span>.binding_array_elements.validate(
+            limits.max_binding_array_elements_per_shader_stage,
+            BindingTypeMaxCountErrorKind::BindingArrayElements,
+        )<span class="question-mark">?</span>;
+        <span class="self">self</span>.binding_array_sampler_elements.validate(
+            limits.max_binding_array_sampler_elements_per_shader_stage,
+            BindingTypeMaxCountErrorKind::BindingArraySamplerElements,
+        )<span class="question-mark">?</span>;
         <span class="prelude-val">Ok</span>(())
     }
 

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

@@ -5780,9 +5780,6 @@
             entries: <span class="kw-2">&amp;</span>hal_bindings,
         };
 
-        <span class="kw">let </span>raw = <span class="kw">unsafe </span>{ <span class="self">self</span>.raw().create_bind_group_layout(<span class="kw-2">&amp;</span>hal_desc) }
-            .map_err(|e| <span class="self">self</span>.handle_hal_error(e))<span class="question-mark">?</span>;
-
         <span class="kw">let </span><span class="kw-2">mut </span>count_validator = binding_model::BindingTypeMaxCountValidator::default();
         <span class="kw">for </span>entry <span class="kw">in </span>entry_map.values() {
             count_validator.add_binding(entry);
@@ -5796,6 +5793,9 @@
         <span class="comment">// Validate that binding arrays don't conflict with dynamic offsets.
         </span>count_validator.validate_binding_arrays()<span class="question-mark">?</span>;
 
+        <span class="kw">let </span>raw = <span class="kw">unsafe </span>{ <span class="self">self</span>.raw().create_bind_group_layout(<span class="kw-2">&amp;</span>hal_desc) }
+            .map_err(|e| <span class="self">self</span>.handle_hal_error(e))<span class="question-mark">?</span>;
+
         <span class="kw">let </span>bgl = BindGroupLayout {
             raw: ManuallyDrop::new(raw),
             device: <span class="self">self</span>.clone(),

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

@@ -607,7 +607,11 @@
 <a href="#606" id="606">606</a>
 <a href="#607" id="607">607</a>
 <a href="#608" id="608">608</a>
-<a href="#609" id="609">609</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
+<a href="#609" id="609">609</a>
+<a href="#610" id="610">610</a>
+<a href="#611" id="611">611</a>
+<a href="#612" id="612">612</a>
+<a href="#613" id="613">613</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
 
 <span class="kw">use </span>wgpu::{Instance, Surface};
 <span class="kw">use </span>winit::{
@@ -1121,7 +1125,11 @@
 
                 <span class="kw">let </span>features = E::required_features() | params.optional_features;
 
-                params.base_test_parameters.clone().features(features)
+                params
+                    .base_test_parameters
+                    .clone()
+                    .features(features)
+                    .limits(E::required_limits())
             })
             .run_async(<span class="kw">move </span>|ctx| <span class="kw">async move </span>{
                 <span class="kw">let </span>format = <span class="kw">if </span>E::SRGB {

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

@@ -461,7 +461,14 @@
 <a href="#460" id="460">460</a>
 <a href="#461" id="461">461</a>
 <a href="#462" id="462">462</a>
-<a href="#463" id="463">463</a></pre></div><pre class="rust"><code><span class="kw">use </span>bytemuck::{Pod, Zeroable};
+<a href="#463" id="463">463</a>
+<a href="#464" id="464">464</a>
+<a href="#465" id="465">465</a>
+<a href="#466" id="466">466</a>
+<a href="#467" id="467">467</a>
+<a href="#468" id="468">468</a>
+<a href="#469" id="469">469</a>
+<a href="#470" id="470">470</a></pre></div><pre class="rust"><code><span class="kw">use </span>bytemuck::{Pod, Zeroable};
 <span class="kw">use </span>std::num::{NonZeroU32, NonZeroU64};
 <span class="kw">use </span>wgpu::util::DeviceExt;
 
@@ -541,6 +548,13 @@
     <span class="kw">fn </span>required_features() -&gt; wgpu::Features {
         wgpu::Features::TEXTURE_BINDING_ARRAY
     }
+    <span class="kw">fn </span>required_limits() -&gt; wgpu::Limits {
+        wgpu::Limits {
+            max_binding_array_elements_per_shader_stage: <span class="number">6</span>,
+            max_binding_array_sampler_elements_per_shader_stage: <span class="number">2</span>,
+            ..wgpu::Limits::downlevel_defaults()
+        }
+    }
     <span class="kw">fn </span>init(
         config: <span class="kw-2">&amp;</span>wgpu::SurfaceConfiguration,
         _adapter: <span class="kw-2">&amp;</span>wgpu::Adapter,

doc/src/wgpu_core/binding_model.rs.html

@@ -1290,7 +1290,9 @@
 <a href="#1289" id="1289">1289</a>
 <a href="#1290" id="1290">1290</a>
 <a href="#1291" id="1291">1291</a>
-<a href="#1292" id="1292">1292</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
+<a href="#1292" id="1292">1292</a>
+<a href="#1293" id="1293">1293</a>
+<a href="#1294" id="1294">1294</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
 <span class="kw">use </span>parking_lot::Mutex;
 <span class="kw">use </span>std::sync::{atomic::AtomicU8, Arc};
 <span class="kw">use </span>wgt::AstcChannel;
@@ -1977,6 +1979,8 @@
             max_storage_buffers_per_shader_stage,
             max_storage_textures_per_shader_stage,
             max_uniform_buffers_per_shader_stage,
+            max_binding_array_elements_per_shader_stage: <span class="number">0</span>,
+            max_binding_array_sampler_elements_per_shader_stage: <span class="number">0</span>,
             max_uniform_buffer_binding_size: <span class="kw">unsafe </span>{
                 gl.get_parameter_i32(glow::MAX_UNIFORM_BLOCK_SIZE)
             } <span class="kw">as </span>u32,

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

@@ -440,7 +440,9 @@
 <a href="#439" id="439">439</a>
 <a href="#440" id="440">440</a>
 <a href="#441" id="441">441</a>
-<a href="#442" id="442">442</a></pre></div><pre class="rust"><code><span class="attr">#![allow(unused_variables)]
+<a href="#442" id="442">442</a>
+<a href="#443" id="443">443</a>
+<a href="#444" id="444">444</a></pre></div><pre class="rust"><code><span class="attr">#![allow(unused_variables)]
 
 </span><span class="kw">use </span><span class="kw">crate</span>::TlasInstance;
 <span class="kw">use </span>core::ptr;
@@ -589,6 +591,8 @@
             max_storage_buffers_per_shader_stage: ALLOC_MAX_U32,
             max_storage_textures_per_shader_stage: ALLOC_MAX_U32,
             max_uniform_buffers_per_shader_stage: ALLOC_MAX_U32,
+            max_binding_array_elements_per_shader_stage: ALLOC_MAX_U32,
+            max_binding_array_sampler_elements_per_shader_stage: ALLOC_MAX_U32,
             max_uniform_buffer_binding_size: ALLOC_MAX_U32,
             max_storage_buffer_binding_size: ALLOC_MAX_U32,
             max_vertex_buffers: ALLOC_MAX_U32,