Skip to content

Commit 2fe537d

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@ae6c6fb 🚀
1 parent 88717a3 commit 2fe537d

28 files changed

+100
-97
lines changed

doc/search-index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/src/wgpu/backend/wgpu_core.rs.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,9 +3381,6 @@
33813381
<a href="#3380" id="3380">3380</a>
33823382
<a href="#3381" id="3381">3381</a>
33833383
<a href="#3382" id="3382">3382</a>
3384-
<a href="#3383" id="3383">3383</a>
3385-
<a href="#3384" id="3384">3384</a>
3386-
<a href="#3385" id="3385">3385</a>
33873384
</pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
33883385
context::downcast_ref, AdapterInfo, BindGroupDescriptor, BindGroupLayoutDescriptor,
33893386
BindingResource, BufferBinding, BufferDescriptor, CommandEncoderDescriptor, CompilationInfo,
@@ -4102,10 +4099,7 @@
41024099
</span>.surface_get_capabilities(surface_data.id, <span class="kw-2">*</span>adapter_data)
41034100
{
41044101
<span class="prelude-val">Ok</span>(caps) =&gt; caps,
4105-
<span class="prelude-val">Err</span>(wgc::instance::GetSurfaceSupportError::Unsupported) =&gt; {
4106-
wgt::SurfaceCapabilities::default()
4107-
}
4108-
<span class="prelude-val">Err</span>(err) =&gt; <span class="self">self</span>.handle_error_fatal(err, <span class="string">"Surface::get_supported_formats"</span>),
4102+
<span class="prelude-val">Err</span>(<span class="kw">_</span>) =&gt; wgt::SurfaceCapabilities::default(),
41094103
}
41104104
}
41114105

doc/src/wgpu_core/instance.rs.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,8 @@
974974
<a href="#973" id="973">973</a>
975975
<a href="#974" id="974">974</a>
976976
<a href="#975" id="975">975</a>
977+
<a href="#976" id="976">976</a>
978+
<a href="#977" id="977">977</a>
977979
</pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
978980
<span class="kw">use </span>std::{borrow::Cow, collections::HashMap};
979981

@@ -1388,13 +1390,13 @@
13881390
<span class="kw-2">&amp;</span><span class="self">self</span>,
13891391
adapter: <span class="kw-2">&amp;</span>hal::DynExposedAdapter,
13901392
) -&gt; <span class="prelude-ty">Result</span>&lt;hal::SurfaceCapabilities, GetSurfaceSupportError&gt; {
1393+
<span class="kw">let </span>backend = adapter.backend();
13911394
<span class="kw">let </span>suf = <span class="self">self
1392-
</span>.raw(adapter.backend())
1393-
.ok_or(GetSurfaceSupportError::Unsupported)<span class="question-mark">?</span>;
1395+
</span>.raw(backend)
1396+
.ok_or(GetSurfaceSupportError::NotSupportedByBackend(backend))<span class="question-mark">?</span>;
13941397
<span class="macro">profiling::scope!</span>(<span class="string">"surface_capabilities"</span>);
13951398
<span class="kw">let </span>caps = <span class="kw">unsafe </span>{ adapter.adapter.surface_capabilities(suf) }
1396-
.ok_or(GetSurfaceSupportError::Unsupported)<span class="question-mark">?</span>;
1397-
1399+
.ok_or(GetSurfaceSupportError::FailedToRetrieveSurfaceCapabilitiesForAdapter)<span class="question-mark">?</span>;
13981400
<span class="prelude-val">Ok</span>(caps)
13991401
}
14001402

@@ -1625,8 +1627,10 @@
16251627
<span class="attr">#[derive(Clone, Debug, Error)]
16261628
#[non_exhaustive]
16271629
</span><span class="kw">pub enum </span>GetSurfaceSupportError {
1628-
<span class="attr">#[error(<span class="string">"Surface is not supported by the adapter"</span>)]
1629-
</span>Unsupported,
1630+
<span class="attr">#[error(<span class="string">"Surface is not supported for the specified backend {0}"</span>)]
1631+
</span>NotSupportedByBackend(Backend),
1632+
<span class="attr">#[error(<span class="string">"Failed to retrieve surface capabilities for the specified adapter."</span>)]
1633+
</span>FailedToRetrieveSurfaceCapabilitiesForAdapter,
16301634
}
16311635

16321636
<span class="attr">#[derive(Clone, Debug, Error)]

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,6 +2445,8 @@
24452445
<a href="#2444" id="2444">2444</a>
24462446
<a href="#2445" id="2445">2445</a>
24472447
<a href="#2446" id="2446">2446</a>
2448+
<a href="#2447" id="2447">2447</a>
2449+
<a href="#2448" id="2448">2448</a>
24482450
</pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::conv;
24492451

24502452
<span class="kw">use </span>ash::{amd, ext, google, khr, vk};
@@ -4709,7 +4711,8 @@
47094711
<span class="prelude-val">Ok</span>(present_modes) =&gt; present_modes,
47104712
<span class="prelude-val">Err</span>(e) =&gt; {
47114713
<span class="macro">log::error!</span>(<span class="string">"get_physical_device_surface_present_modes: {}"</span>, e);
4712-
Vec::new()
4714+
<span class="comment">// Per definition of `SurfaceCapabilities`, there must be at least one present mode.
4715+
</span><span class="kw">return </span><span class="prelude-val">None</span>;
47134716
}
47144717
}
47154718
};
@@ -4724,7 +4727,8 @@
47244727
<span class="prelude-val">Ok</span>(formats) =&gt; formats,
47254728
<span class="prelude-val">Err</span>(e) =&gt; {
47264729
<span class="macro">log::error!</span>(<span class="string">"get_physical_device_surface_formats: {}"</span>, e);
4727-
Vec::new()
4730+
<span class="comment">// Per definition of `SurfaceCapabilities`, there must be at least one present format.
4731+
</span><span class="kw">return </span><span class="prelude-val">None</span>;
47284732
}
47294733
}
47304734
};

doc/wgpu/struct.CompilationInfo.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

doc/wgpu_core/device/enum.DeviceError.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

doc/wgpu_core/global/struct.Global.html

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

doc/wgpu_core/instance/enum.CreateSurfaceError.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

doc/wgpu_core/instance/enum.GetSurfaceSupportError.html

Lines changed: 5 additions & 4 deletions
Large diffs are not rendered by default.

doc/wgpu_core/instance/enum.RequestAdapterError.html

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)