Skip to content

Commit 0ae245f

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@07becfe 🚀
1 parent 9b3dd37 commit 0ae245f

File tree

93 files changed

+662
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+662
-650
lines changed

doc/src/wgpu_hal/gles/egl.rs.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,7 @@
16561656
<span class="kw">match </span><span class="self">self</span>.display {
16571657
DisplayRef::X11(ptr) =&gt; <span class="kw">unsafe </span>{
16581658
<span class="kw">let </span>func: libloading::Symbol&lt;XCloseDisplayFun&gt; =
1659-
<span class="self">self</span>.library.get(<span class="string">b"XCloseDisplay"</span>).unwrap();
1659+
<span class="self">self</span>.library.get(<span class="string">b"XCloseDisplay\0"</span>).unwrap();
16601660
func(ptr.as_ptr());
16611661
},
16621662
DisplayRef::Wayland =&gt; {}
@@ -1668,7 +1668,7 @@
16681668
<span class="macro">log::debug!</span>(<span class="string">"Loading X11 library to get the current display"</span>);
16691669
<span class="kw">unsafe </span>{
16701670
<span class="kw">let </span>library = find_library(<span class="kw-2">&amp;</span>[<span class="string">"libX11.so.6"</span>, <span class="string">"libX11.so"</span>])<span class="question-mark">?</span>;
1671-
<span class="kw">let </span>func: libloading::Symbol&lt;XOpenDisplayFun&gt; = library.get(<span class="string">b"XOpenDisplay"</span>).unwrap();
1671+
<span class="kw">let </span>func: libloading::Symbol&lt;XOpenDisplayFun&gt; = library.get(<span class="string">b"XOpenDisplay\0"</span>).unwrap();
16721672
<span class="kw">let </span>result = func(ptr::null());
16731673
ptr::NonNull::new(result).map(|ptr| DisplayOwner {
16741674
display: DisplayRef::X11(ptr),
@@ -1695,9 +1695,9 @@
16951695
<span class="kw">let </span>library = <span class="kw">unsafe </span>{
16961696
<span class="kw">let </span>client_library = find_library(<span class="kw-2">&amp;</span>[<span class="string">"libwayland-client.so.0"</span>, <span class="string">"libwayland-client.so"</span>])<span class="question-mark">?</span>;
16971697
<span class="kw">let </span>wl_display_connect: libloading::Symbol&lt;WlDisplayConnectFun&gt; =
1698-
client_library.get(<span class="string">b"wl_display_connect"</span>).unwrap();
1698+
client_library.get(<span class="string">b"wl_display_connect\0"</span>).unwrap();
16991699
<span class="kw">let </span>wl_display_disconnect: libloading::Symbol&lt;WlDisplayDisconnectFun&gt; =
1700-
client_library.get(<span class="string">b"wl_display_disconnect"</span>).unwrap();
1700+
client_library.get(<span class="string">b"wl_display_disconnect\0"</span>).unwrap();
17011701
<span class="kw">let </span>display = ptr::NonNull::new(wl_display_connect(ptr::null()))<span class="question-mark">?</span>;
17021702
wl_display_disconnect(display.as_ptr());
17031703
find_library(<span class="kw-2">&amp;</span>[<span class="string">"libwayland-egl.so.1"</span>, <span class="string">"libwayland-egl.so"</span>])<span class="question-mark">?
@@ -2807,7 +2807,7 @@
28072807
(WindowKind::Wayland, Rwh::Wayland(handle)) =&gt; {
28082808
<span class="kw">let </span>library = <span class="kw-2">&amp;</span><span class="self">self</span>.wsi.display_owner.as_ref().unwrap().library;
28092809
<span class="kw">let </span>wl_egl_window_create: libloading::Symbol&lt;WlEglWindowCreateFun&gt; =
2810-
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_create"</span>) }.unwrap();
2810+
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_create\0"</span>) }.unwrap();
28112811
<span class="kw">let </span>window =
28122812
<span class="kw">unsafe </span>{ wl_egl_window_create(handle.surface.as_ptr(), <span class="number">640</span>, <span class="number">480</span>) }
28132813
.cast();
@@ -2916,7 +2916,7 @@
29162916
<span class="kw">if let </span><span class="prelude-val">Some</span>(window) = wl_window {
29172917
<span class="kw">let </span>library = <span class="kw-2">&amp;</span><span class="self">self</span>.wsi.display_owner.as_ref().unwrap().library;
29182918
<span class="kw">let </span>wl_egl_window_resize: libloading::Symbol&lt;WlEglWindowResizeFun&gt; =
2919-
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_resize"</span>) }.unwrap();
2919+
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_resize\0"</span>) }.unwrap();
29202920
<span class="kw">unsafe </span>{
29212921
wl_egl_window_resize(
29222922
window,
@@ -2988,7 +2988,7 @@
29882988
.expect(<span class="string">"unsupported window"</span>)
29892989
.library;
29902990
<span class="kw">let </span>wl_egl_window_destroy: libloading::Symbol&lt;WlEglWindowDestroyFun&gt; =
2991-
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_destroy"</span>) }.unwrap();
2991+
<span class="kw">unsafe </span>{ library.get(<span class="string">b"wl_egl_window_destroy\0"</span>) }.unwrap();
29922992
<span class="kw">unsafe </span>{ wl_egl_window_destroy(window) };
29932993
}
29942994
}

doc/src/wgpu_hal/lib.rs.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,6 +2333,18 @@
23332333
<a href="#2332" id="2332">2332</a>
23342334
<a href="#2333" id="2333">2333</a>
23352335
<a href="#2334" id="2334">2334</a>
2336+
<a href="#2335" id="2335">2335</a>
2337+
<a href="#2336" id="2336">2336</a>
2338+
<a href="#2337" id="2337">2337</a>
2339+
<a href="#2338" id="2338">2338</a>
2340+
<a href="#2339" id="2339">2339</a>
2341+
<a href="#2340" id="2340">2340</a>
2342+
<a href="#2341" id="2341">2341</a>
2343+
<a href="#2342" id="2342">2342</a>
2344+
<a href="#2343" id="2343">2343</a>
2345+
<a href="#2344" id="2344">2344</a>
2346+
<a href="#2345" id="2345">2345</a>
2347+
<a href="#2346" id="2346">2346</a>
23362348
</pre></div><pre class="rust"><code><span class="doccomment">//! A cross-platform unsafe graphics abstraction.
23372349
//!
23382350
//! This crate defines a set of traits abstracting over modern graphics APIs,
@@ -2680,6 +2692,18 @@
26802692
</span>Unexpected,
26812693
}
26822694

2695+
<span class="attr">#[allow(dead_code)] </span><span class="comment">// may be unused on some platforms
2696+
</span><span class="attr">#[cold]
2697+
</span><span class="kw">fn </span>hal_usage_error&lt;T: fmt::Display&gt;(txt: T) -&gt; ! {
2698+
<span class="macro">panic!</span>(<span class="string">"wgpu-hal invariant was violated (usage error): {txt}"</span>)
2699+
}
2700+
2701+
<span class="attr">#[allow(dead_code)] </span><span class="comment">// may be unused on some platforms
2702+
</span><span class="attr">#[cold]
2703+
</span><span class="kw">fn </span>hal_internal_error&lt;T: fmt::Display&gt;(txt: T) -&gt; ! {
2704+
<span class="macro">panic!</span>(<span class="string">"wgpu-hal ran into a preventable internal error: {txt}"</span>)
2705+
}
2706+
26832707
<span class="attr">#[derive(Clone, Debug, Eq, PartialEq, Error)]
26842708
</span><span class="kw">pub enum </span>ShaderError {
26852709
<span class="attr">#[error(<span class="string">"Compilation failed: {0:?}"</span>)]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4406,7 +4406,7 @@
44064406
vk::Result::ERROR_TOO_MANY_OBJECTS =&gt; <span class="kw">crate</span>::DeviceError::OutOfMemory,
44074407
vk::Result::ERROR_INITIALIZATION_FAILED =&gt; <span class="kw">crate</span>::DeviceError::Lost,
44084408
vk::Result::ERROR_EXTENSION_NOT_PRESENT | vk::Result::ERROR_FEATURE_NOT_PRESENT =&gt; {
4409-
<span class="kw">super</span>::hal_usage_error(err)
4409+
<span class="kw">crate</span>::hal_usage_error(err)
44104410
}
44114411
other =&gt; <span class="kw">super</span>::map_host_device_oom_and_lost_err(other),
44124412
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3541,14 +3541,14 @@
35413541
.contains(gpu_alloc::MemoryPropertyFlags::HOST_COHERENT);
35423542
<span class="prelude-val">Ok</span>(<span class="kw">crate</span>::BufferMapping { ptr, is_coherent })
35433543
} <span class="kw">else </span>{
3544-
<span class="kw">super</span>::hal_usage_error(<span class="string">"tried to map external buffer"</span>)
3544+
<span class="kw">crate</span>::hal_usage_error(<span class="string">"tried to map external buffer"</span>)
35453545
}
35463546
}
35473547
<span class="kw">unsafe fn </span>unmap_buffer(<span class="kw-2">&amp;</span><span class="self">self</span>, buffer: <span class="kw-2">&amp;</span><span class="kw">super</span>::Buffer) {
35483548
<span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">ref </span>block) = buffer.block {
35493549
<span class="kw">unsafe </span>{ block.lock().unmap(<span class="kw-2">&amp;*</span><span class="self">self</span>.shared) };
35503550
} <span class="kw">else </span>{
3551-
<span class="kw">super</span>::hal_usage_error(<span class="string">"tried to unmap external buffer"</span>)
3551+
<span class="kw">crate</span>::hal_usage_error(<span class="string">"tried to unmap external buffer"</span>)
35523552
}
35533553
}
35543554

@@ -5091,7 +5091,7 @@
50915091
}
50925092
}
50935093
<span class="prelude-val">None </span>=&gt; {
5094-
<span class="kw">super</span>::hal_usage_error(<span class="macro">format!</span>(
5094+
<span class="kw">crate</span>::hal_usage_error(<span class="macro">format!</span>(
50955095
<span class="string">"no signals reached value {}"</span>,
50965096
wait_value
50975097
));
@@ -5108,7 +5108,7 @@
51085108
<span class="kw">use </span>gpu_alloc::AllocationError <span class="kw">as </span>Ae;
51095109
<span class="kw">match </span>error {
51105110
Ae::OutOfDeviceMemory | Ae::OutOfHostMemory | Ae::TooManyObjects =&gt; <span class="self">Self</span>::OutOfMemory,
5111-
Ae::NoCompatibleMemoryTypes =&gt; <span class="kw">super</span>::hal_usage_error(error),
5111+
Ae::NoCompatibleMemoryTypes =&gt; <span class="kw">crate</span>::hal_usage_error(error),
51125112
}
51135113
}
51145114
}
@@ -5117,7 +5117,7 @@
51175117
<span class="kw">use </span>gpu_alloc::MapError <span class="kw">as </span>Me;
51185118
<span class="kw">match </span>error {
51195119
Me::OutOfDeviceMemory | Me::OutOfHostMemory | Me::MapFailed =&gt; <span class="self">Self</span>::OutOfMemory,
5120-
Me::NonHostVisible | Me::AlreadyMapped =&gt; <span class="kw">super</span>::hal_usage_error(error),
5120+
Me::NonHostVisible | Me::AlreadyMapped =&gt; <span class="kw">crate</span>::hal_usage_error(error),
51215121
}
51225122
}
51235123
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,11 +1361,6 @@
13611361
<a href="#1360" id="1360">1360</a>
13621362
<a href="#1361" id="1361">1361</a>
13631363
<a href="#1362" id="1362">1362</a>
1364-
<a href="#1363" id="1363">1363</a>
1365-
<a href="#1364" id="1364">1364</a>
1366-
<a href="#1365" id="1365">1365</a>
1367-
<a href="#1366" id="1366">1366</a>
1368-
<a href="#1367" id="1367">1367</a>
13691364
</pre></div><pre class="rust"><code><span class="doccomment">/*!
13701365
# Vulkan API internals.
13711366

@@ -2728,9 +2723,4 @@
27282723
<span class="attr">#[allow(unreachable_code)]
27292724
</span><span class="kw">crate</span>::DeviceError::Lost
27302725
}
2731-
2732-
<span class="attr">#[cold]
2733-
</span><span class="kw">fn </span>hal_usage_error&lt;T: fmt::Display&gt;(txt: T) -&gt; ! {
2734-
<span class="macro">panic!</span>(<span class="string">"wgpu-hal invariant was violated (usage error): {txt}"</span>)
2735-
}
27362726
</code></pre></div></section></main></body></html>

doc/src/wgpu_types/lib.rs.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14877,10 +14877,6 @@
1487714877

1487814878
<span class="doccomment">/// Selects which DX12 shader compiler to use.
1487914879
///
14880-
/// If the `wgpu-hal/dx12-shader-compiler` feature isn't enabled then this will fall back
14881-
/// to the Fxc compiler at runtime and log an error.
14882-
/// This feature is always enabled when using `wgpu`.
14883-
///
1488414880
/// If the `Dxc` option is selected, but `dxcompiler.dll` and `dxil.dll` files aren't found,
1488514881
/// then this will fall back to the Fxc compiler at runtime and log an error.
1488614882
///
@@ -14897,6 +14893,10 @@
1489714893
///
1489814894
/// However, it requires both `dxcompiler.dll` and `dxil.dll` to be shipped with the application.
1489914895
/// These files can be downloaded from &lt;https://github.com/microsoft/DirectXShaderCompiler/releases&gt;.
14896+
///
14897+
/// Minimum supported version: [v1.5.2010](https://github.com/microsoft/DirectXShaderCompiler/releases/tag/v1.5.2010)
14898+
///
14899+
/// It also requires WDDM 2.1 (Windows 10 version 1607).
1490014900
</span>Dxc {
1490114901
<span class="doccomment">/// Path to the `dxil.dll` file, or path to the directory containing `dxil.dll` file. Passing `None` will use standard platform specific dll loading rules.
1490214902
</span>dxil_path: <span class="prelude-ty">Option</span>&lt;PathBuf&gt;,

0 commit comments

Comments
 (0)