Skip to content

Commit b2ef5f5

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@a1fc4a0 🚀
1 parent d403d90 commit b2ef5f5

File tree

171 files changed

+1004
-609
lines changed

Some content is hidden

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

171 files changed

+1004
-609
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/wgpu-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/search.desc/wgpu_types/wgpu_types-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-files.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/src/wgpu_core/instance.rs.html

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -988,12 +988,7 @@
988988
<a href="#987" id="987">987</a>
989989
<a href="#988" id="988">988</a>
990990
<a href="#989" id="989">989</a>
991-
<a href="#990" id="990">990</a>
992-
<a href="#991" id="991">991</a>
993-
<a href="#992" id="992">992</a>
994-
<a href="#993" id="993">993</a>
995-
<a href="#994" id="994">994</a>
996-
<a href="#995" id="995">995</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::borrow::Cow;
991+
<a href="#990" id="990">990</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::borrow::Cow;
997992
<span class="kw">use </span>std::sync::Arc;
998993

999994
<span class="kw">use </span>hashbrown::HashMap;
@@ -1070,12 +1065,7 @@
10701065
<span class="kw">let </span>hal_desc = hal::InstanceDescriptor {
10711066
name: <span class="string">"wgpu"</span>,
10721067
flags: instance_desc.flags,
1073-
dx12_shader_compiler: instance_desc
1074-
.backend_options
1075-
.dx12
1076-
.shader_compiler
1077-
.clone(),
1078-
gles_minor_version: instance_desc.backend_options.gl.gles_minor_version,
1068+
backend_options: instance_desc.backend_options.clone(),
10791069
};
10801070

10811071
<span class="kw">use </span>hal::Instance <span class="kw">as _</span>;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,9 @@
12871287
<a href="#1286" id="1286">1286</a>
12881288
<a href="#1287" id="1287">1287</a>
12891289
<a href="#1288" id="1288">1288</a>
1290-
<a href="#1289" id="1289">1289</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
1290+
<a href="#1289" id="1289">1289</a>
1291+
<a href="#1290" id="1290">1290</a>
1292+
<a href="#1291" id="1291">1291</a></pre></div><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
12911293
<span class="kw">use </span>parking_lot::Mutex;
12921294
<span class="kw">use </span>std::sync::{atomic::AtomicU8, Arc};
12931295
<span class="kw">use </span>wgt::AstcChannel;
@@ -1481,6 +1483,7 @@
14811483

14821484
<span class="kw">pub</span>(<span class="kw">super</span>) <span class="kw">unsafe fn </span>expose(
14831485
context: <span class="kw">super</span>::AdapterContext,
1486+
backend_options: wgt::GlBackendOptions,
14841487
) -&gt; <span class="prelude-ty">Option</span>&lt;<span class="kw">crate</span>::ExposedAdapter&lt;<span class="kw">super</span>::Api&gt;&gt; {
14851488
<span class="kw">let </span>gl = context.lock();
14861489
<span class="kw">let </span>extensions = gl.supported_extensions();
@@ -2113,6 +2116,7 @@
21132116
private_caps,
21142117
workarounds,
21152118
features,
2119+
options: backend_options,
21162120
shading_language_version,
21172121
next_shader_id: Default::default(),
21182122
program_cache: Default::default(),

0 commit comments

Comments
 (0)