Skip to content

Commit d5ef288

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@1da7cd4 🚀
1 parent 848b509 commit d5ef288

File tree

854 files changed

+3823
-3772
lines changed

Some content is hidden

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

854 files changed

+3823
-3772
lines changed

doc/search-index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu_hal/wgpu_hal-desc-0-.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_hal/gles/command.rs.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,9 @@
12551255
<a href="#1254" id="1254">1254</a>
12561256
<a href="#1255" id="1255">1255</a>
12571257
<a href="#1256" id="1256">1256</a>
1258-
<a href="#1257" id="1257">1257</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::string::String;
1258+
<a href="#1257" id="1257">1257</a>
1259+
<a href="#1258" id="1258">1258</a>
1260+
<a href="#1259" id="1259">1259</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::string::String;
12591261
<span class="kw">use </span>core::{mem, ops::Range};
12601262

12611263
<span class="kw">use </span>arrayvec::ArrayVec;
@@ -1780,6 +1782,8 @@
17801782
.any(|at| <span class="kw">match </span>at.target.view.inner {
17811783
<span class="attr">#[cfg(webgl)]
17821784
</span><span class="kw">super</span>::TextureInner::ExternalFramebuffer { .. } =&gt; <span class="bool-val">true</span>,
1785+
<span class="attr">#[cfg(native)]
1786+
</span><span class="kw">super</span>::TextureInner::ExternalNativeFramebuffer { .. } =&gt; <span class="bool-val">true</span>,
17831787
<span class="kw">_ </span>=&gt; <span class="bool-val">false</span>,
17841788
});
17851789

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,9 @@
16321632
<a href="#1631" id="1631">1631</a>
16331633
<a href="#1632" id="1632">1632</a>
16341634
<a href="#1633" id="1633">1633</a>
1635-
<a href="#1634" id="1634">1634</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
1635+
<a href="#1634" id="1634">1634</a>
1636+
<a href="#1635" id="1635">1635</a>
1637+
<a href="#1636" id="1636">1636</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
16361638
borrow::ToOwned, format, string::String, string::ToString <span class="kw">as _</span>, sync::Arc, vec, vec::Vec,
16371639
};
16381640
<span class="kw">use </span>core::{cmp::max, convert::TryInto, num::NonZeroU32, ptr, sync::atomic::Ordering};
@@ -2603,6 +2605,8 @@
26032605
}
26042606
<span class="attr">#[cfg(webgl)]
26052607
</span><span class="kw">super</span>::TextureInner::ExternalFramebuffer { .. } =&gt; {}
2608+
<span class="attr">#[cfg(native)]
2609+
</span><span class="kw">super</span>::TextureInner::ExternalNativeFramebuffer { .. } =&gt; {}
26062610
}
26072611
}
26082612

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,21 @@
11161116
<a href="#1115" id="1115">1115</a>
11171117
<a href="#1116" id="1116">1116</a>
11181118
<a href="#1117" id="1117">1117</a>
1119-
<a href="#1118" id="1118">1118</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
1119+
<a href="#1118" id="1118">1118</a>
1120+
<a href="#1119" id="1119">1119</a>
1121+
<a href="#1120" id="1120">1120</a>
1122+
<a href="#1121" id="1121">1121</a>
1123+
<a href="#1122" id="1122">1122</a>
1124+
<a href="#1123" id="1123">1123</a>
1125+
<a href="#1124" id="1124">1124</a>
1126+
<a href="#1125" id="1125">1125</a>
1127+
<a href="#1126" id="1126">1126</a>
1128+
<a href="#1127" id="1127">1127</a>
1129+
<a href="#1128" id="1128">1128</a>
1130+
<a href="#1129" id="1129">1129</a>
1131+
<a href="#1130" id="1130">1130</a>
1132+
<a href="#1131" id="1131">1131</a>
1133+
<a href="#1132" id="1132">1132</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
11201134
# OpenGL ES3 API (aka GLES3).
11211135

11221136
Designed to work on Linux and Android, with context provided by EGL.
@@ -1484,9 +1498,21 @@
14841498
target: BindTarget,
14851499
},
14861500
<span class="attr">#[cfg(webgl)]
1501+
</span><span class="doccomment">/// Render to a `WebGLFramebuffer`
1502+
///
1503+
/// This is a web feature
14871504
</span>ExternalFramebuffer {
14881505
inner: web_sys::WebGlFramebuffer,
14891506
},
1507+
<span class="attr">#[cfg(native)]
1508+
</span><span class="doccomment">/// Render to a `glow::NativeFramebuffer`
1509+
/// Useful when the framebuffer to draw to
1510+
/// has a non-zero framebuffer ID
1511+
///
1512+
/// This is a native feature
1513+
</span>ExternalNativeFramebuffer {
1514+
inner: glow::NativeFramebuffer,
1515+
},
14901516
}
14911517

14921518
<span class="attr">#[cfg(send_sync)]
@@ -1503,6 +1529,8 @@
15031529
<span class="self">Self</span>::Texture { raw, target } =&gt; (raw, target),
15041530
<span class="attr">#[cfg(webgl)]
15051531
</span><span class="self">Self</span>::ExternalFramebuffer { .. } =&gt; <span class="macro">panic!</span>(<span class="string">"Unexpected external framebuffer"</span>),
1532+
<span class="attr">#[cfg(native)]
1533+
</span><span class="self">Self</span>::ExternalNativeFramebuffer { .. } =&gt; <span class="macro">panic!</span>(<span class="string">"unexpected external framebuffer"</span>),
15061534
}
15071535
}
15081536
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,11 @@
18931893
<a href="#1892" id="1892">1892</a>
18941894
<a href="#1893" id="1893">1893</a>
18951895
<a href="#1894" id="1894">1894</a>
1896-
<a href="#1895" id="1895">1895</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::sync::Arc;
1896+
<a href="#1895" id="1895">1895</a>
1897+
<a href="#1896" id="1896">1896</a>
1898+
<a href="#1897" id="1897">1897</a>
1899+
<a href="#1898" id="1898">1898</a>
1900+
<a href="#1899" id="1899">1899</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::sync::Arc;
18971901
<span class="kw">use </span>alloc::vec;
18981902
<span class="kw">use </span>core::sync::atomic::Ordering;
18991903

@@ -2053,6 +2057,10 @@
20532057
</span><span class="kw">super</span>::TextureInner::ExternalFramebuffer { <span class="kw-2">ref </span>inner } =&gt; <span class="kw">unsafe </span>{
20542058
gl.bind_external_framebuffer(glow::FRAMEBUFFER, inner);
20552059
},
2060+
<span class="attr">#[cfg(native)]
2061+
</span><span class="kw">super</span>::TextureInner::ExternalNativeFramebuffer { <span class="kw-2">ref </span>inner } =&gt; <span class="kw">unsafe </span>{
2062+
gl.bind_framebuffer(glow::FRAMEBUFFER, <span class="prelude-val">Some</span>(<span class="kw-2">*</span>inner));
2063+
},
20562064
}
20572065
}
20582066

doc/trait.impl/core/borrow/trait.Borrow.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/trait.impl/core/convert/trait.From.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)