Deploying to master from @ 4992de59385e9b26b4fc148ec0395ad9377bd390 🚀

Author: cwfitzgerald

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

@@ -871,6 +871,18 @@
 <span id="871">871</span>
 <span id="872">872</span>
 <span id="873">873</span>
+<span id="874">874</span>
+<span id="875">875</span>
+<span id="876">876</span>
+<span id="877">877</span>
+<span id="878">878</span>
+<span id="879">879</span>
+<span id="880">880</span>
+<span id="881">881</span>
+<span id="882">882</span>
+<span id="883">883</span>
+<span id="884">884</span>
+<span id="885">885</span>
 </pre><pre class="rust"><code><span class="kw">use </span>glow::HasContext;
 <span class="kw">use </span>std::sync::Arc;
 <span class="kw">use </span>wgt::AstcChannel;
@@ -1228,11 +1240,22 @@
             <span class="comment">// This is a part of GLES-3 but not WebGL2 core
             </span>!<span class="macro">cfg!</span>(target_arch = <span class="string">&quot;wasm32&quot;</span>) || extensions.contains(<span class="string">&quot;WEBGL_compressed_texture_etc&quot;</span>),
         );
-        features.set(
-            wgt::Features::TEXTURE_COMPRESSION_ASTC_LDR,
-            extensions.contains(<span class="string">&quot;GL_KHR_texture_compression_astc_ldr&quot;</span>)
-                || extensions.contains(<span class="string">&quot;WEBGL_compressed_texture_astc&quot;</span>),
-        );
+        <span class="comment">// `OES_texture_compression_astc` provides 2D + 3D, LDR + HDR support
+        </span><span class="kw">if </span>extensions.contains(<span class="string">&quot;WEBGL_compressed_texture_astc&quot;</span>)
+            || extensions.contains(<span class="string">&quot;GL_OES_texture_compression_astc&quot;</span>)
+        {
+            features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC_LDR);
+            features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC_HDR);
+        } <span class="kw">else </span>{
+            features.set(
+                wgt::Features::TEXTURE_COMPRESSION_ASTC_LDR,
+                extensions.contains(<span class="string">&quot;GL_KHR_texture_compression_astc_ldr&quot;</span>),
+            );
+            features.set(
+                wgt::Features::TEXTURE_COMPRESSION_ASTC_HDR,
+                extensions.contains(<span class="string">&quot;GL_KHR_texture_compression_astc_hdr&quot;</span>),
+            );
+        }
 
         <span class="kw">let </span><span class="kw-2">mut </span>private_caps = <span class="kw">super</span>::PrivateCapabilities::empty();
         private_caps.set(
@@ -1541,6 +1564,7 @@
         <span class="kw">let </span>bcn_features = feature_fn(wgt::Features::TEXTURE_COMPRESSION_BC, filterable);
         <span class="kw">let </span>etc2_features = feature_fn(wgt::Features::TEXTURE_COMPRESSION_ETC2, filterable);
         <span class="kw">let </span>astc_features = feature_fn(wgt::Features::TEXTURE_COMPRESSION_ASTC_LDR, filterable);
+        <span class="kw">let </span>astc_hdr_features = feature_fn(wgt::Features::TEXTURE_COMPRESSION_ASTC_HDR, filterable);
 
         <span class="kw">let </span>private_caps_fn = |f, caps| {
             <span class="kw">if </span><span class="self">self</span>.shared.private_caps.contains(f) {
@@ -1638,7 +1662,7 @@
             Tf::Astc {
                 block: <span class="kw">_</span>,
                 channel: AstcChannel::Hdr,
-            } =&gt; Tfc::empty(),
+            } =&gt; astc_hdr_features,
         }
     }
 

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

@@ -447,7 +447,6 @@
 <span id="447">447</span>
 <span id="448">448</span>
 <span id="449">449</span>
-<span id="450">450</span>
 </pre><pre class="rust"><code><span class="kw">impl </span><span class="kw">super</span>::AdapterShared {
     <span class="kw">pub</span>(<span class="kw">super</span>) <span class="kw">fn </span>describe_texture_format(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
@@ -565,7 +564,7 @@
             Tf::EacRg11Unorm =&gt; (glow::COMPRESSED_RG11_EAC, glow::RG, <span class="number">0</span>),
             Tf::EacRg11Snorm =&gt; (glow::COMPRESSED_SIGNED_RG11_EAC, glow::RG, <span class="number">0</span>),
             Tf::Astc { block, channel } =&gt; <span class="kw">match </span>channel {
-                AstcChannel::Unorm =&gt; <span class="kw">match </span>block {
+                AstcChannel::Unorm | AstcChannel::Hdr =&gt; <span class="kw">match </span>block {
                     AstcBlock::B4x4 =&gt; (glow::COMPRESSED_RGBA_ASTC_4x4_KHR, glow::RGBA, <span class="number">0</span>),
                     AstcBlock::B5x4 =&gt; (glow::COMPRESSED_RGBA_ASTC_5x4_KHR, glow::RGBA, <span class="number">0</span>),
                     AstcBlock::B5x5 =&gt; (glow::COMPRESSED_RGBA_ASTC_5x5_KHR, glow::RGBA, <span class="number">0</span>),
@@ -609,7 +608,6 @@
                         (glow::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, glow::RGBA, <span class="number">0</span>)
                     }
                 },
-                AstcChannel::Hdr =&gt; <span class="macro">unimplemented!</span>(),
             },
         };
 

doc/wgpu/struct.Features.html

@@ -353,6 +353,7 @@
 <ul>
 <li>Metal</li>
 <li>Vulkan</li>
+<li>OpenGL</li>
 </ul>
 <p>This is a native-only feature.</p>
 </div></details><details class="rustdoc-toggle" open><summary><section id="associatedconstant.WRITE_TIMESTAMP_INSIDE_PASSES" class="associatedconstant has-srclink"><h4 class="code-header">pub const <a href="#associatedconstant.WRITE_TIMESTAMP_INSIDE_PASSES" class="constant">WRITE_TIMESTAMP_INSIDE_PASSES</a>: <a class="struct" href="struct.Features.html" title="struct wgpu::Features">Features</a> = Self{ bits: 1 &lt;&lt; 41,}</h4></section></summary><div class="docblock"><p>Allows for timestamp queries inside renderpasses. Metal does not allow this