Skip to content

Commit 8ec32b2

Browse files
cwfitzgeraldcwfitzgerald
committed
Deploying to master from @ cdf6ee0c877e908de0ca73f9ef2696c6f4c4fa41 🚀
1 parent 35c2a76 commit 8ec32b2

File tree

56 files changed

+279
-258
lines changed

Some content is hidden

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

56 files changed

+279
-258
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/gles/adapter.rs.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,7 @@
868868
<span id="868">868</span>
869869
<span id="869">869</span>
870870
<span id="870">870</span>
871+
<span id="871">871</span>
871872
</pre><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
872873
<span class="kw">use </span>std::sync::Arc;
873874
<span class="kw">use </span>wgt::AstcChannel;
@@ -1595,11 +1596,12 @@
15951596
Tf::Rgba32Uint =&gt; renderable | storage,
15961597
Tf::Rgba32Sint =&gt; renderable | storage,
15971598
Tf::Rgba32Float =&gt; unfilterable | storage | float_renderable,
1598-
Tf::Depth32Float
1599+
<span class="comment">//Tf::Stencil8 |
1600+
</span>Tf::Depth16Unorm
1601+
| Tf::Depth32Float
15991602
| Tf::Depth32FloatStencil8
16001603
| Tf::Depth24Plus
1601-
| Tf::Depth24PlusStencil8
1602-
| Tf::Depth24UnormStencil8 =&gt; depth,
1604+
| Tf::Depth24PlusStencil8 =&gt; depth,
16031605
Tf::Rgb9e5Ufloat =&gt; filterable,
16041606
Tf::Bc1RgbaUnorm
16051607
| Tf::Bc1RgbaUnormSrgb

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,12 @@
442442
<span id="442">442</span>
443443
<span id="443">443</span>
444444
<span id="444">444</span>
445+
<span id="445">445</span>
446+
<span id="446">446</span>
447+
<span id="447">447</span>
448+
<span id="448">448</span>
449+
<span id="449">449</span>
450+
<span id="450">450</span>
445451
</pre><pre class="rust"><code><span class="kw">impl </span><span class="kw">super</span>::AdapterShared {
446452
<span class="kw">pub</span>(<span class="kw">super</span>) <span class="kw">fn </span>describe_texture_format(
447453
<span class="kw-2">&amp;</span><span class="self">self</span>,
@@ -500,6 +506,12 @@
500506
Tf::Rgba32Uint =&gt; (glow::RGBA32UI, glow::RGBA_INTEGER, glow::UNSIGNED_INT),
501507
Tf::Rgba32Sint =&gt; (glow::RGBA32I, glow::RGBA_INTEGER, glow::INT),
502508
Tf::Rgba32Float =&gt; (glow::RGBA32F, glow::RGBA, glow::FLOAT),
509+
<span class="comment">//Tf::Stencil8 =&gt; (glow::R8UI, glow::STENCIL_COMPONENTS, glow::UNSIGNED_BYTE),
510+
</span>Tf::Depth16Unorm =&gt; (
511+
glow::DEPTH_COMPONENT16,
512+
glow::DEPTH_COMPONENT,
513+
glow::UNSIGNED_SHORT,
514+
),
503515
Tf::Depth32Float =&gt; (glow::DEPTH_COMPONENT32F, glow::DEPTH_COMPONENT, glow::FLOAT),
504516
Tf::Depth32FloatStencil8 =&gt; {
505517
(glow::DEPTH32F_STENCIL8, glow::DEPTH_COMPONENT, glow::FLOAT)
@@ -509,7 +521,7 @@
509521
glow::DEPTH_COMPONENT,
510522
glow::UNSIGNED_NORMALIZED,
511523
),
512-
Tf::Depth24PlusStencil8 | Tf::Depth24UnormStencil8 =&gt; (
524+
Tf::Depth24PlusStencil8 =&gt; (
513525
glow::DEPTH24_STENCIL8,
514526
glow::DEPTH_COMPONENT,
515527
glow::UNSIGNED_INT,

‎doc/src/wgpu_hal/lib.rs.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,8 @@
12071207
<span id="1207">1207</span>
12081208
<span id="1208">1208</span>
12091209
<span id="1209">1209</span>
1210+
<span id="1210">1210</span>
1211+
<span id="1211">1211</span>
12101212
</pre><pre class="rust"><code><span class="doccomment">/*! This library describes the internal unsafe graphics abstraction API.
12111213
* It follows WebGPU for the most part, re-using wgpu-types,
12121214
* with the following deviations:
@@ -1821,10 +1823,12 @@
18211823
<span class="kw">impl </span>From&lt;wgt::TextureFormat&gt; <span class="kw">for </span>FormatAspects {
18221824
<span class="kw">fn </span>from(format: wgt::TextureFormat) -&gt; <span class="self">Self </span>{
18231825
<span class="kw">match </span>format {
1826+
<span class="comment">//wgt::TextureFormat::Stencil8 =&gt; Self::STENCIL,
1827+
</span>wgt::TextureFormat::Depth16Unorm =&gt; <span class="self">Self</span>::DEPTH,
18241828
wgt::TextureFormat::Depth32Float | wgt::TextureFormat::Depth24Plus =&gt; <span class="self">Self</span>::DEPTH,
1825-
wgt::TextureFormat::Depth32FloatStencil8
1826-
| wgt::TextureFormat::Depth24PlusStencil8
1827-
| wgt::TextureFormat::Depth24UnormStencil8 =&gt; <span class="self">Self</span>::DEPTH | <span class="self">Self</span>::STENCIL,
1829+
wgt::TextureFormat::Depth32FloatStencil8 | wgt::TextureFormat::Depth24PlusStencil8 =&gt; {
1830+
<span class="self">Self</span>::DEPTH | <span class="self">Self</span>::STENCIL
1831+
}
18281832
<span class="kw">_ </span>=&gt; <span class="self">Self</span>::COLOR,
18291833
}
18301834
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,7 @@
20402040
);
20412041

20422042
features.set(
2043-
F::DEPTH24UNORM_STENCIL8,
2043+
F::DEPTH24PLUS_STENCIL8,
20442044
supports_format(
20452045
instance,
20462046
phd,

‎doc/src/wgpu_hal/vulkan/conv.rs.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@
828828
<span id="828">828</span>
829829
<span id="829">829</span>
830830
<span id="830">830</span>
831+
<span id="831">831</span>
831832
</pre><pre class="rust"><code><span class="kw">use </span>ash::vk;
832833
<span class="kw">use </span>std::num::NonZeroU32;
833834

@@ -894,7 +895,8 @@
894895
F::D32_SFLOAT_S8_UINT
895896
}
896897
}
897-
Tf::Depth24UnormStencil8 =&gt; F::D24_UNORM_S8_UINT,
898+
<span class="comment">//Tf::Stencil8 =&gt; F::R8_UNORM,
899+
</span>Tf::Depth16Unorm =&gt; F::D16_UNORM,
898900
Tf::Rgb9e5Ufloat =&gt; F::E5B9G9R9_UFLOAT_PACK32,
899901
Tf::Bc1RgbaUnorm =&gt; F::BC1_RGBA_UNORM_BLOCK,
900902
Tf::Bc1RgbaUnormSrgb =&gt; F::BC1_RGBA_SRGB_BLOCK,

0 commit comments

Comments
 (0)