Skip to content

Commit 1764fff

Browse files
jimblandyjimblandy
committed
Deploying to master from @ gfx-rs/wgpu@0d69482 🚀
1 parent 1e57eed commit 1764fff

File tree

4 files changed

+32
-94
lines changed

4 files changed

+32
-94
lines changed

‎doc/src/wgpu_hal/vulkan/adapter.rs.html‎

Lines changed: 23 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,37 +2435,6 @@
24352435
<a href="#2434" id="2434">2434</a>
24362436
<a href="#2435" id="2435">2435</a>
24372437
<a href="#2436" id="2436">2436</a>
2438-
<a href="#2437" id="2437">2437</a>
2439-
<a href="#2438" id="2438">2438</a>
2440-
<a href="#2439" id="2439">2439</a>
2441-
<a href="#2440" id="2440">2440</a>
2442-
<a href="#2441" id="2441">2441</a>
2443-
<a href="#2442" id="2442">2442</a>
2444-
<a href="#2443" id="2443">2443</a>
2445-
<a href="#2444" id="2444">2444</a>
2446-
<a href="#2445" id="2445">2445</a>
2447-
<a href="#2446" id="2446">2446</a>
2448-
<a href="#2447" id="2447">2447</a>
2449-
<a href="#2448" id="2448">2448</a>
2450-
<a href="#2449" id="2449">2449</a>
2451-
<a href="#2450" id="2450">2450</a>
2452-
<a href="#2451" id="2451">2451</a>
2453-
<a href="#2452" id="2452">2452</a>
2454-
<a href="#2453" id="2453">2453</a>
2455-
<a href="#2454" id="2454">2454</a>
2456-
<a href="#2455" id="2455">2455</a>
2457-
<a href="#2456" id="2456">2456</a>
2458-
<a href="#2457" id="2457">2457</a>
2459-
<a href="#2458" id="2458">2458</a>
2460-
<a href="#2459" id="2459">2459</a>
2461-
<a href="#2460" id="2460">2460</a>
2462-
<a href="#2461" id="2461">2461</a>
2463-
<a href="#2462" id="2462">2462</a>
2464-
<a href="#2463" id="2463">2463</a>
2465-
<a href="#2464" id="2464">2464</a>
2466-
<a href="#2465" id="2465">2465</a>
2467-
<a href="#2466" id="2466">2466</a>
2468-
<a href="#2467" id="2467">2467</a>
24692438
</pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::conv;
24702439

24712440
<span class="kw">use </span>ash::{amd, ext, google, khr, vk};
@@ -3028,21 +2997,13 @@
30282997
<span class="self">self</span>.core.shader_sampled_image_array_dynamic_indexing != <span class="number">0</span>,
30292998
);
30302999
features.set(F::SHADER_PRIMITIVE_INDEX, <span class="self">self</span>.core.geometry_shader != <span class="number">0</span>);
3031-
<span class="kw">if </span><span class="self">Self</span>::all_features_supported(
3032-
<span class="kw-2">&amp;</span>features,
3033-
<span class="kw-2">&amp;</span>[
3034-
(
3035-
F::BUFFER_BINDING_ARRAY,
3036-
<span class="self">self</span>.core.shader_storage_buffer_array_dynamic_indexing,
3037-
),
3038-
(
3039-
F::TEXTURE_BINDING_ARRAY,
3040-
<span class="self">self</span>.core.shader_storage_image_array_dynamic_indexing,
3041-
),
3042-
],
3043-
) {
3044-
features.insert(F::STORAGE_RESOURCE_BINDING_ARRAY);
3045-
}
3000+
features.set(
3001+
F::STORAGE_RESOURCE_BINDING_ARRAY,
3002+
(features.contains(F::BUFFER_BINDING_ARRAY)
3003+
&amp;&amp; <span class="self">self</span>.core.shader_storage_buffer_array_dynamic_indexing != <span class="number">0</span>)
3004+
|| (features.contains(F::TEXTURE_BINDING_ARRAY)
3005+
&amp;&amp; <span class="self">self</span>.core.shader_storage_image_array_dynamic_indexing != <span class="number">0</span>),
3006+
);
30463007
<span class="comment">//if self.core.shader_storage_image_array_dynamic_indexing != 0 {
30473008
//if self.core.shader_clip_distance != 0 {
30483009
//if self.core.shader_cull_distance != 0 {
@@ -3073,36 +3034,22 @@
30733034

30743035
<span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">ref </span>descriptor_indexing) = <span class="self">self</span>.descriptor_indexing {
30753036
<span class="kw">const </span>STORAGE: F = F::STORAGE_RESOURCE_BINDING_ARRAY;
3076-
<span class="kw">if </span><span class="self">Self</span>::all_features_supported(
3077-
<span class="kw-2">&amp;</span>features,
3078-
<span class="kw-2">&amp;</span>[
3079-
(
3080-
F::TEXTURE_BINDING_ARRAY,
3081-
descriptor_indexing.shader_sampled_image_array_non_uniform_indexing,
3082-
),
3083-
(
3084-
F::BUFFER_BINDING_ARRAY | STORAGE,
3085-
descriptor_indexing.shader_storage_buffer_array_non_uniform_indexing,
3086-
),
3087-
],
3088-
) {
3089-
features.insert(F::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING);
3090-
}
3091-
<span class="kw">if </span><span class="self">Self</span>::all_features_supported(
3092-
<span class="kw-2">&amp;</span>features,
3093-
<span class="kw-2">&amp;</span>[
3094-
(
3095-
F::BUFFER_BINDING_ARRAY,
3096-
descriptor_indexing.shader_uniform_buffer_array_non_uniform_indexing,
3097-
),
3098-
(
3099-
F::TEXTURE_BINDING_ARRAY | STORAGE,
3100-
descriptor_indexing.shader_storage_image_array_non_uniform_indexing,
3101-
),
3102-
],
3103-
) {
3104-
features.insert(F::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING);
3105-
}
3037+
features.set(
3038+
F::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
3039+
(features.contains(F::TEXTURE_BINDING_ARRAY)
3040+
&amp;&amp; descriptor_indexing.shader_sampled_image_array_non_uniform_indexing != <span class="number">0</span>)
3041+
&amp;&amp; (features.contains(F::BUFFER_BINDING_ARRAY | STORAGE)
3042+
&amp;&amp; descriptor_indexing.shader_storage_buffer_array_non_uniform_indexing
3043+
!= <span class="number">0</span>),
3044+
);
3045+
features.set(
3046+
F::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING,
3047+
(features.contains(F::BUFFER_BINDING_ARRAY)
3048+
&amp;&amp; descriptor_indexing.shader_uniform_buffer_array_non_uniform_indexing != <span class="number">0</span>)
3049+
&amp;&amp; (features.contains(F::TEXTURE_BINDING_ARRAY | STORAGE)
3050+
&amp;&amp; descriptor_indexing.shader_storage_image_array_non_uniform_indexing
3051+
!= <span class="number">0</span>),
3052+
);
31063053
<span class="kw">if </span>descriptor_indexing.descriptor_binding_partially_bound != <span class="number">0 </span>&amp;&amp; !intel_windows {
31073054
features |= F::PARTIALLY_BOUND_BINDING_ARRAY;
31083055
}
@@ -3251,15 +3198,6 @@
32513198

32523199
(features, dl_flags)
32533200
}
3254-
3255-
<span class="kw">fn </span>all_features_supported(
3256-
features: <span class="kw-2">&amp;</span>wgt::Features,
3257-
implications: <span class="kw-2">&amp;</span>[(wgt::Features, vk::Bool32)],
3258-
) -&gt; bool {
3259-
implications
3260-
.iter()
3261-
.all(|<span class="kw-2">&amp;</span>(flag, support)| !features.contains(flag) || support != <span class="number">0</span>)
3262-
}
32633201
}
32643202

32653203
<span class="doccomment">/// Vulkan "properties" structures gathered about a physical device.

‎doc/wgpu_hal/trait.Adapter.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
) -&gt; <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.SurfaceCapabilities.html" title="struct wgpu_hal::SurfaceCapabilities">SurfaceCapabilities</a>&gt;</h4></section></summary><div class="docblock"><p>Returns the capabilities of working with a specified surface.</p>
3434
<p><code>None</code> means presentation is not supported for it.</p>
3535
</div></details><details class="toggle method-toggle" open><summary><section id="tymethod.get_presentation_timestamp" class="method"><a class="src rightside" href="../src/wgpu_hal/lib.rs.html#639">source</a><h4 class="code-header">unsafe fn <a href="#tymethod.get_presentation_timestamp" class="fn">get_presentation_timestamp</a>(&amp;self) -&gt; PresentationTimestamp</h4></section></summary><div class="docblock"><p>Creates a <a href="wgt::PresentationTimestamp"><code>PresentationTimestamp</code></a> using the adapter’s WSI.</p>
36-
</div></details></div><h2 id="implementors" class="section-header">Implementors<a href="#implementors" class="anchor">§</a></h2><div id="implementors-list"><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/empty.rs.html#113-138">source</a><a href="#impl-Adapter-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for <a class="struct" href="empty/struct.Context.html" title="struct wgpu_hal::empty::Context">Context</a></h3></section></summary><div class="impl-items"><section id="associatedtype.A-1" class="associatedtype trait-impl"><a href="#associatedtype.A-1" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="empty/struct.Api.html" title="struct wgpu_hal::empty::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#943-1220">source</a><a href="#impl-Adapter-for-Adapter" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::gles::<a class="struct" href="gles/struct.Adapter.html" title="struct wgpu_hal::gles::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>gles</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-2" class="associatedtype trait-impl"><a href="#associatedtype.A-2" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="gles/struct.Api.html" title="struct wgpu_hal::gles::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2039-2351">source</a><a href="#impl-Adapter-for-Adapter-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Adapter.html" title="struct wgpu_hal::vulkan::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>vulkan</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-3" class="associatedtype trait-impl"><a href="#associatedtype.A-3" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="vulkan/struct.Api.html" title="struct wgpu_hal::vulkan::Api">Api</a></h4></section></div></details></div><script src="../trait.impl/wgpu_hal/trait.Adapter.js" async></script></section></div></main></body></html>
36+
</div></details></div><h2 id="implementors" class="section-header">Implementors<a href="#implementors" class="anchor">§</a></h2><div id="implementors-list"><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/empty.rs.html#113-138">source</a><a href="#impl-Adapter-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for <a class="struct" href="empty/struct.Context.html" title="struct wgpu_hal::empty::Context">Context</a></h3></section></summary><div class="impl-items"><section id="associatedtype.A-1" class="associatedtype trait-impl"><a href="#associatedtype.A-1" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="empty/struct.Api.html" title="struct wgpu_hal::empty::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#943-1220">source</a><a href="#impl-Adapter-for-Adapter" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::gles::<a class="struct" href="gles/struct.Adapter.html" title="struct wgpu_hal::gles::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>gles</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-2" class="associatedtype trait-impl"><a href="#associatedtype.A-2" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="gles/struct.Api.html" title="struct wgpu_hal::gles::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2008-2320">source</a><a href="#impl-Adapter-for-Adapter-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Adapter.html" title="struct wgpu_hal::vulkan::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>vulkan</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-3" class="associatedtype trait-impl"><a href="#associatedtype.A-3" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="vulkan/struct.Api.html" title="struct wgpu_hal::vulkan::Api">Api</a></h4></section></div></details></div><script src="../trait.impl/wgpu_hal/trait.Adapter.js" async></script></section></div></main></body></html>

0 commit comments

Comments
 (0)