Skip to content

Commit e389b5a

Browse files
committed
Deploying to master from @ f877a8a3c9cfac9b9972bc4b06d08922ab292f36 🚀
1 parent 38ef312 commit e389b5a

35 files changed

+64
-28
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_hal/auxil/mod.rs.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@
105105
<span id="105">105</span>
106106
<span id="106">106</span>
107107
<span id="107">107</span>
108+
<span id="108">108</span>
109+
<span id="109">109</span>
110+
<span id="110">110</span>
111+
<span id="111">111</span>
112+
<span id="112">112</span>
113+
<span id="113">113</span>
114+
<span id="114">114</span>
115+
<span id="115">115</span>
116+
<span id="116">116</span>
117+
<span id="117">117</span>
108118
</pre><pre class="rust"><code><span class="attribute">#[cfg(any(feature = <span class="string">&quot;dx11&quot;</span>, feature = <span class="string">&quot;dx12&quot;</span>))]
109119
</span><span class="kw">pub</span>(<span class="kw">super</span>) <span class="kw">mod </span>dxgi;
110120

@@ -115,6 +125,9 @@
115125
<span class="kw">pub mod </span>amd {
116126
<span class="kw">pub const </span>VENDOR: u32 = <span class="number">0x1002</span>;
117127
}
128+
<span class="kw">pub mod </span>apple {
129+
<span class="kw">pub const </span>VENDOR: u32 = <span class="number">0x106B</span>;
130+
}
118131
<span class="kw">pub mod </span>arm {
119132
<span class="kw">pub const </span>VENDOR: u32 = <span class="number">0x13B5</span>;
120133
}
@@ -129,6 +142,13 @@
129142
<span class="kw">pub const </span>DEVICE_KABY_LAKE_MASK: u32 = <span class="number">0x5900</span>;
130143
<span class="kw">pub const </span>DEVICE_SKY_LAKE_MASK: u32 = <span class="number">0x1900</span>;
131144
}
145+
<span class="kw">pub mod </span>mesa {
146+
<span class="comment">// Mesa does not actually have a PCI vendor id.
147+
//
148+
// To match Vulkan, we use the VkVendorId for Mesa in the gles backend so that lavapipe (Vulkan) and
149+
// llvmpipe (OpenGL) have the same vendor id.
150+
</span><span class="kw">pub const </span>VENDOR: u32 = <span class="number">0x10005</span>;
151+
}
132152
<span class="kw">pub mod </span>nvidia {
133153
<span class="kw">pub const </span>VENDOR: u32 = <span class="number">0x10DE</span>;
134154
}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,10 @@
864864
<span id="864">864</span>
865865
<span id="865">865</span>
866866
<span id="866">866</span>
867+
<span id="867">867</span>
868+
<span id="868">868</span>
869+
<span id="869">869</span>
870+
<span id="870">870</span>
867871
</pre><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
868872
<span class="kw">use </span>std::sync::Arc;
869873
<span class="kw">use </span>wgt::AstcChannel;
@@ -988,8 +992,8 @@
988992
<span class="string">&quot;mali&quot;</span>,
989993
<span class="string">&quot;intel&quot;</span>,
990994
<span class="string">&quot;v3d&quot;</span>,
991-
<span class="string">&quot;apple m1&quot;</span>,
992-
];
995+
<span class="string">&quot;apple m&quot;</span>, <span class="comment">// all apple m are integrated
996+
</span>];
993997
<span class="kw">let </span>strings_that_imply_cpu = [<span class="string">&quot;mesa offscreen&quot;</span>, <span class="string">&quot;swiftshader&quot;</span>, <span class="string">&quot;llvmpipe&quot;</span>];
994998

995999
<span class="comment">//TODO: handle Intel Iris XE as discreet
@@ -1026,6 +1030,10 @@
10261030
db::intel::VENDOR
10271031
} <span class="kw">else if </span>vendor.contains(<span class="string">&quot;broadcom&quot;</span>) {
10281032
db::broadcom::VENDOR
1033+
} <span class="kw">else if </span>vendor.contains(<span class="string">&quot;mesa&quot;</span>) {
1034+
db::mesa::VENDOR
1035+
} <span class="kw">else if </span>vendor.contains(<span class="string">&quot;apple&quot;</span>) {
1036+
db::apple::VENDOR
10291037
} <span class="kw">else </span>{
10301038
<span class="number">0
10311039
</span>};

‎doc/wgpu/struct.AdapterInfo.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
}</code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Information about an adapter.</p>
1010
</div></details><h2 id="fields" class="fields small-section-header">Fields<a href="#fields" class="anchor"></a></h2><span id="structfield.name" class="structfield small-section-header"><a href="#structfield.name" class="anchor field"></a><code>name: <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/string/struct.String.html" title="struct alloc::string::String">String</a></code></span><div class="docblock"><p>Adapter name</p>
1111
</div><span id="structfield.vendor" class="structfield small-section-header"><a href="#structfield.vendor" class="anchor field"></a><code>vendor: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a></code></span><div class="docblock"><p>Vendor PCI id of the adapter</p>
12+
<p>If the vendor has no PCI id, then this value will be the backend’s vendor id equivalent. On Vulkan,
13+
Mesa would have a vendor id equivalent to it’s <code>VkVendorId</code> value.</p>
1214
</div><span id="structfield.device" class="structfield small-section-header"><a href="#structfield.device" class="anchor field"></a><code>device: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a></code></span><div class="docblock"><p>PCI id of the adapter</p>
1315
</div><span id="structfield.device_type" class="structfield small-section-header"><a href="#structfield.device_type" class="anchor field"></a><code>device_type: <a class="enum" href="enum.DeviceType.html" title="enum wgpu::DeviceType">DeviceType</a></code></span><div class="docblock"><p>Type of device</p>
1416
</div><span id="structfield.backend" class="structfield small-section-header"><a href="#structfield.backend" class="anchor field"></a><code>backend: <a class="enum" href="enum.Backend.html" title="enum wgpu::Backend">Backend</a></code></span><div class="docblock"><p>Backend used for device</p>

‎doc/wgpu_hal/all.html

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

‎doc/wgpu_hal/auxil/constant.MAX_I32_BINDING_SIZE.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="Maximum binding size for the shaders that only support `i32` indexing. Interestingly, the index itself can’t reach that high, because the minimum element size is 4 bytes, but the compiler toolchain still computes the offset at some intermediate point, internally, as i32."><meta name="keywords" content="rust, rustlang, rust-lang, MAX_I32_BINDING_SIZE"><title>MAX_I32_BINDING_SIZE in wgpu_hal::auxil - Rust</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" href="../../normalize.css"><link rel="stylesheet" href="../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" href="../../ayu.css" disabled><link rel="stylesheet" href="../../dark.css" disabled><link rel="stylesheet" href="../../light.css" id="themeStyle"><script id="default-settings" ></script><script src="../../storage.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../main.js"></script><noscript><link rel="stylesheet" href="../../noscript.css"></noscript><link rel="alternate icon" type="image/png" href="../../favicon-16x16.png"><link rel="alternate icon" type="image/png" href="../../favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="../../favicon.svg"></head><body class="rustdoc constant"><!--[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">&#9776;</button><a class="sidebar-logo" href="../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div></a><h2 class="location"></h2></nav><nav class="sidebar"><a class="sidebar-logo" href="../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div></a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In wgpu_hal::auxil</a></h2></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../wgpu_hal/index.html"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></a><nav class="sub"><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><div id="help-button" title="help" tabindex="-1"><button type="button">?</button></div><div id="settings-menu" tabindex="-1"><a href="../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../wheel.svg"></a></div></div></form></nav></div><section id="main-content" class="content"><div class="main-heading"><h1 class="fqn"><span class="in-band">Constant <a href="../index.html">wgpu_hal</a>::<wbr><a href="index.html">auxil</a>::<wbr><a class="constant" href="#">MAX_I32_BINDING_SIZE</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../src/wgpu_hal/auxil/mod.rs.html#37">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust const"><code>pub const MAX_I32_BINDING_SIZE: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.u32.html">u32</a> = _; // 2_147_483_648u32</code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Maximum binding size for the shaders that only support <code>i32</code> indexing.
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="Maximum binding size for the shaders that only support `i32` indexing. Interestingly, the index itself can’t reach that high, because the minimum element size is 4 bytes, but the compiler toolchain still computes the offset at some intermediate point, internally, as i32."><meta name="keywords" content="rust, rustlang, rust-lang, MAX_I32_BINDING_SIZE"><title>MAX_I32_BINDING_SIZE in wgpu_hal::auxil - Rust</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" href="../../normalize.css"><link rel="stylesheet" href="../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" href="../../ayu.css" disabled><link rel="stylesheet" href="../../dark.css" disabled><link rel="stylesheet" href="../../light.css" id="themeStyle"><script id="default-settings" ></script><script src="../../storage.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../main.js"></script><noscript><link rel="stylesheet" href="../../noscript.css"></noscript><link rel="alternate icon" type="image/png" href="../../favicon-16x16.png"><link rel="alternate icon" type="image/png" href="../../favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="../../favicon.svg"></head><body class="rustdoc constant"><!--[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">&#9776;</button><a class="sidebar-logo" href="../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div></a><h2 class="location"></h2></nav><nav class="sidebar"><a class="sidebar-logo" href="../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></div></a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In wgpu_hal::auxil</a></h2></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../wgpu_hal/index.html"><img class="rust-logo" src="../../rust-logo.svg" alt="logo"></a><nav class="sub"><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><div id="help-button" title="help" tabindex="-1"><button type="button">?</button></div><div id="settings-menu" tabindex="-1"><a href="../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../wheel.svg"></a></div></div></form></nav></div><section id="main-content" class="content"><div class="main-heading"><h1 class="fqn"><span class="in-band">Constant <a href="../index.html">wgpu_hal</a>::<wbr><a href="index.html">auxil</a>::<wbr><a class="constant" href="#">MAX_I32_BINDING_SIZE</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../src/wgpu_hal/auxil/mod.rs.html#47">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust const"><code>pub const MAX_I32_BINDING_SIZE: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.u32.html">u32</a> = _; // 2_147_483_648u32</code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Maximum binding size for the shaders that only support <code>i32</code> indexing.
22
Interestingly, the index itself can’t reach that high, because the minimum
33
element size is 4 bytes, but the compiler toolchain still computes the
44
offset at some intermediate point, internally, as i32.</p>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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 `VENDOR` constant in crate `wgpu_hal`."><meta name="keywords" content="rust, rustlang, rust-lang, VENDOR"><title>VENDOR in wgpu_hal::auxil::db::apple - Rust</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" href="../../../../normalize.css"><link rel="stylesheet" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" href="../../../../ayu.css" disabled><link rel="stylesheet" href="../../../../dark.css" disabled><link rel="stylesheet" href="../../../../light.css" id="themeStyle"><script id="default-settings" ></script><script src="../../../../storage.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../../main.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="alternate icon" type="image/png" href="../../../../favicon-16x16.png"><link rel="alternate icon" type="image/png" href="../../../../favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="../../../../favicon.svg"></head><body class="rustdoc constant"><!--[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">&#9776;</button><a class="sidebar-logo" href="../../../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../../../rust-logo.svg" alt="logo"></div></a><h2 class="location"></h2></nav><nav class="sidebar"><a class="sidebar-logo" href="../../../../wgpu_hal/index.html"><div class="logo-container"><img class="rust-logo" src="../../../../rust-logo.svg" alt="logo"></div></a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In wgpu_hal::auxil::db::apple</a></h2></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../../../wgpu_hal/index.html"><img class="rust-logo" src="../../../../rust-logo.svg" alt="logo"></a><nav class="sub"><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><div id="help-button" title="help" tabindex="-1"><button type="button">?</button></div><div id="settings-menu" tabindex="-1"><a href="../../../../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../../../../wheel.svg"></a></div></div></form></nav></div><section id="main-content" class="content"><div class="main-heading"><h1 class="fqn"><span class="in-band">Constant <a href="../../../index.html">wgpu_hal</a>::<wbr><a href="../../index.html">auxil</a>::<wbr><a href="../index.html">db</a>::<wbr><a href="index.html">apple</a>::<wbr><a class="constant" href="#">VENDOR</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../../../../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../../../../src/wgpu_hal/auxil/mod.rs.html#12">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust const"><code>pub const VENDOR: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.u32.html">u32</a> = 0x106B;</code></pre></div></section></div></main><div id="rustdoc-vars" data-root-path="../../../../" data-current-crate="wgpu_hal" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.66.0-nightly (2019147c5 2022-09-19)" ></div></body></html>

0 commit comments

Comments
 (0)