Skip to content

Commit 09c2316

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@ff90773 🚀
1 parent a0f7db9 commit 09c2316

22 files changed

+72
-60
lines changed

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,13 @@
15251525
<a href="#1524" id="1524">1524</a>
15261526
<a href="#1525" id="1525">1525</a>
15271527
<a href="#1526" id="1526">1526</a>
1528-
<a href="#1527" id="1527">1527</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
1528+
<a href="#1527" id="1527">1527</a>
1529+
<a href="#1528" id="1528">1528</a>
1530+
<a href="#1529" id="1529">1529</a>
1531+
<a href="#1530" id="1530">1530</a>
1532+
<a href="#1531" id="1531">1531</a>
1533+
<a href="#1532" id="1532">1532</a>
1534+
<a href="#1533" id="1533">1533</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
15291535
<span class="kw">use </span>hashbrown::HashMap;
15301536
<span class="kw">use </span>once_cell::sync::Lazy;
15311537
<span class="kw">use </span>parking_lot::{MappedMutexGuard, Mutex, MutexGuard, RwLock};
@@ -1786,11 +1792,12 @@
17861792
</span><span class="macro">log::warn!</span>(<span class="string">"EGL says it can present to the window but not natively"</span>,);
17871793
}
17881794
<span class="comment">// Android emulator can't natively present either.
1789-
</span><span class="kw">let </span>tier_threshold = <span class="kw">if </span><span class="macro">cfg!</span>(target_os = <span class="string">"android"</span>) || <span class="macro">cfg!</span>(windows) {
1790-
<span class="number">1
1791-
</span>} <span class="kw">else </span>{
1792-
<span class="number">2
1793-
</span>};
1795+
</span><span class="kw">let </span>tier_threshold =
1796+
<span class="kw">if </span><span class="macro">cfg!</span>(target_os = <span class="string">"android"</span>) || <span class="macro">cfg!</span>(windows) || <span class="macro">cfg!</span>(target_env = <span class="string">"ohos"</span>) {
1797+
<span class="number">1
1798+
</span>} <span class="kw">else </span>{
1799+
<span class="number">2
1800+
</span>};
17941801
<span class="kw">return </span><span class="prelude-val">Ok</span>((config, tier_max &gt;= tier_threshold));
17951802
}
17961803
<span class="prelude-val">Ok</span>(<span class="prelude-val">None</span>) =&gt; {
@@ -2483,6 +2490,7 @@
24832490
(Rwh::Xcb(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
24842491
(Rwh::Win32(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
24852492
(Rwh::AppKit(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
2493+
(Rwh::OhosNdk(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
24862494
<span class="attr">#[cfg(target_os = <span class="string">"android"</span>)]
24872495
</span>(Rwh::AndroidNdk(handle), <span class="kw">_</span>) =&gt; {
24882496
<span class="kw">let </span>format = inner
@@ -2833,6 +2841,7 @@
28332841
(WindowKind::Unknown, Rwh::AndroidNdk(handle)) =&gt; {
28342842
handle.a_native_window.as_ptr()
28352843
}
2844+
(WindowKind::Unknown, Rwh::OhosNdk(handle)) =&gt; handle.native_window.as_ptr(),
28362845
(WindowKind::Wayland, Rwh::Wayland(handle)) =&gt; {
28372846
<span class="kw">let </span>library = <span class="kw-2">&amp;</span><span class="self">self</span>.wsi.display_owner.as_ref().unwrap().library;
28382847
<span class="kw">let </span>wl_egl_window_create: libloading::Symbol&lt;WlEglWindowCreateFun&gt; =
@@ -2876,8 +2885,11 @@
28762885
<span class="comment">// We don't want any of the buffering done by the driver, because we
28772886
// manage a swapchain on our side.
28782887
// Some drivers just fail on surface creation seeing `EGL_SINGLE_BUFFER`.
2879-
</span><span class="kw">if </span><span class="macro">cfg!</span>(any(target_os = <span class="string">"android"</span>, target_os = <span class="string">"macos"</span>))
2880-
|| <span class="macro">cfg!</span>(windows)
2888+
</span><span class="kw">if </span><span class="macro">cfg!</span>(any(
2889+
target_os = <span class="string">"android"</span>,
2890+
target_os = <span class="string">"macos"</span>,
2891+
target_env = <span class="string">"ohos"
2892+
</span>)) || <span class="macro">cfg!</span>(windows)
28812893
|| <span class="self">self</span>.wsi.kind == WindowKind::AngleX11
28822894
{
28832895
khronos_egl::BACK_BUFFER

doc/wgpu_hal/gles/egl/enum.WindowKind.html

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

doc/wgpu_hal/gles/egl/fn.choose_config.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Choose GLES framebuffer configuration."><title>choose_config in wgpu_hal::gles::egl - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-46f98efaafac5295.ttf.woff2,FiraSans-Regular-018c141bf0843ffd.woff2,FiraSans-Medium-8f9a781e4970d388.woff2,SourceCodePro-Regular-562dcc5011b6de7d.ttf.woff2,SourceCodePro-Semibold-d899c5a5c4aeb14a.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-76eba96aa4d2e634.css"><link rel="stylesheet" href="../../../static.files/rustdoc-b0742ba02757f159.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_hal" data-themes="" data-resource-suffix="" data-rustdoc-version="1.83.0 (90b35a623 2024-11-26)" data-channel="1.83.0" data-search-js="search-f0d225181b97f9a4.js" data-settings-js="settings-805db61a62df4bd2.js" ><script src="../../../static.files/storage-1d39b6787ed640ff.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-f070b9041d14864c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-0111fcff984fae8f.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-422f7d1d52889060.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-2c020d218678b618.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_hal/index.html">wgpu_<wbr>hal</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>hal::<wbr>gles::<wbr>egl</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_hal</a>::<wbr><a href="../index.html">gles</a>::<wbr><a href="index.html">egl</a></span><h1>Function <span class="fn">choose_config</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_hal/gles/egl.rs.html#208-282">source</a> </span></div><pre class="rust item-decl"><code>fn choose_config(
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Choose GLES framebuffer configuration."><title>choose_config in wgpu_hal::gles::egl - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-46f98efaafac5295.ttf.woff2,FiraSans-Regular-018c141bf0843ffd.woff2,FiraSans-Medium-8f9a781e4970d388.woff2,SourceCodePro-Regular-562dcc5011b6de7d.ttf.woff2,SourceCodePro-Semibold-d899c5a5c4aeb14a.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-76eba96aa4d2e634.css"><link rel="stylesheet" href="../../../static.files/rustdoc-b0742ba02757f159.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_hal" data-themes="" data-resource-suffix="" data-rustdoc-version="1.83.0 (90b35a623 2024-11-26)" data-channel="1.83.0" data-search-js="search-f0d225181b97f9a4.js" data-settings-js="settings-805db61a62df4bd2.js" ><script src="../../../static.files/storage-1d39b6787ed640ff.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-f070b9041d14864c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-0111fcff984fae8f.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-422f7d1d52889060.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-2c020d218678b618.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_hal/index.html">wgpu_<wbr>hal</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>hal::<wbr>gles::<wbr>egl</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_hal</a>::<wbr><a href="../index.html">gles</a>::<wbr><a href="index.html">egl</a></span><h1>Function <span class="fn">choose_config</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_hal/gles/egl.rs.html#208-283">source</a> </span></div><pre class="rust item-decl"><code>fn choose_config(
22
egl: &amp;DynamicInstance&lt;EGL1_4&gt;,
33
display: Display,
44
srgb_kind: <a class="enum" href="enum.SrgbFrameBufferKind.html" title="enum wgpu_hal::gles::egl::SrgbFrameBufferKind">SrgbFrameBufferKind</a>,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `initialize_display` fn in crate `wgpu_hal`."><title>initialize_display in wgpu_hal::gles::egl - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-46f98efaafac5295.ttf.woff2,FiraSans-Regular-018c141bf0843ffd.woff2,FiraSans-Medium-8f9a781e4970d388.woff2,SourceCodePro-Regular-562dcc5011b6de7d.ttf.woff2,SourceCodePro-Semibold-d899c5a5c4aeb14a.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-76eba96aa4d2e634.css"><link rel="stylesheet" href="../../../static.files/rustdoc-b0742ba02757f159.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_hal" data-themes="" data-resource-suffix="" data-rustdoc-version="1.83.0 (90b35a623 2024-11-26)" data-channel="1.83.0" data-search-js="search-f0d225181b97f9a4.js" data-settings-js="settings-805db61a62df4bd2.js" ><script src="../../../static.files/storage-1d39b6787ed640ff.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-f070b9041d14864c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-0111fcff984fae8f.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-422f7d1d52889060.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-2c020d218678b618.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_hal/index.html">wgpu_<wbr>hal</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>hal::<wbr>gles::<wbr>egl</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_hal</a>::<wbr><a href="../index.html">gles</a>::<wbr><a href="index.html">egl</a></span><h1>Function <span class="fn">initialize_display</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_hal/gles/egl.rs.html#470-481">source</a> </span></div><pre class="rust item-decl"><code>fn initialize_display(
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `initialize_display` fn in crate `wgpu_hal`."><title>initialize_display in wgpu_hal::gles::egl - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-46f98efaafac5295.ttf.woff2,FiraSans-Regular-018c141bf0843ffd.woff2,FiraSans-Medium-8f9a781e4970d388.woff2,SourceCodePro-Regular-562dcc5011b6de7d.ttf.woff2,SourceCodePro-Semibold-d899c5a5c4aeb14a.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-76eba96aa4d2e634.css"><link rel="stylesheet" href="../../../static.files/rustdoc-b0742ba02757f159.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_hal" data-themes="" data-resource-suffix="" data-rustdoc-version="1.83.0 (90b35a623 2024-11-26)" data-channel="1.83.0" data-search-js="search-f0d225181b97f9a4.js" data-settings-js="settings-805db61a62df4bd2.js" ><script src="../../../static.files/storage-1d39b6787ed640ff.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-f070b9041d14864c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-0111fcff984fae8f.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-422f7d1d52889060.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-2c020d218678b618.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_hal/index.html">wgpu_<wbr>hal</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>hal::<wbr>gles::<wbr>egl</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_hal</a>::<wbr><a href="../index.html">gles</a>::<wbr><a href="index.html">egl</a></span><h1>Function <span class="fn">initialize_display</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_hal/gles/egl.rs.html#471-482">source</a> </span></div><pre class="rust item-decl"><code>fn initialize_display(
22
egl: &amp;DynamicInstance&lt;EGL1_4&gt;,
33
display: Display,
44
) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.83.0/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;(<a class="primitive" href="https://doc.rust-lang.org/1.83.0/std/primitive.i32.html">i32</a>, <a class="primitive" href="https://doc.rust-lang.org/1.83.0/std/primitive.i32.html">i32</a>), Error&gt;</code></pre><span class="item-info"><div class="stab portability">Available on <strong><code>gles</code> and neither Windows nor <code>webgl</code></strong> only.</div></span></section></div></main></body></html>

0 commit comments

Comments
 (0)