Deploying to master from @ gfx-rs/wgpu@db4cb26 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -997,11 +997,11 @@
     base_test_parameters: wgpu_test::TestParameters {
         required_features: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_features(),
         required_limits: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_limits(),
-        force_fxc: <span class="bool-val">false</span>,
         skips: <span class="macro">vec!</span>[],
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/search.desc/wgpu_test/wgpu_test-desc-0-.js

@@ -771,11 +771,11 @@
     base_test_parameters: wgpu_test::TestParameters {
         required_features: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_features(),
         required_limits: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_limits(),
-        force_fxc: <span class="bool-val">false</span>,
         skips: <span class="macro">vec!</span>[],
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/src/wgpu_examples/ray_cube_compute/mod.rs.html

@@ -490,7 +490,8 @@
 <a href="#489" id="489">489</a>
 <a href="#490" id="490">490</a>
 <a href="#491" id="491">491</a>
-<a href="#492" id="492">492</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{borrow::Cow, future::Future, iter, mem, pin::Pin, task, time::Instant};
+<a href="#492" id="492">492</a>
+<a href="#493" id="493">493</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{borrow::Cow, future::Future, iter, mem, pin::Pin, task, time::Instant};
 
 <span class="kw">use </span>bytemuck::{Pod, Zeroable};
 <span class="kw">use </span>glam::{Affine3A, Mat4, Quat, Vec3};
@@ -978,6 +979,7 @@
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/src/wgpu_examples/ray_cube_fragment/mod.rs.html

@@ -1131,11 +1131,11 @@
     base_test_parameters: wgpu_test::TestParameters {
         required_features: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_features(),
         required_limits: &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_limits(),
-        force_fxc: <span class="bool-val">false</span>,
         skips: <span class="macro">vec!</span>[],
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/src/wgpu_examples/ray_cube_normals/mod.rs.html

@@ -767,7 +767,7 @@
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
-        force_fxc: <span class="bool-val">false</span>,
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/src/wgpu_examples/ray_scene/mod.rs.html

@@ -443,7 +443,8 @@
 <a href="#442" id="442">442</a>
 <a href="#443" id="443">443</a>
 <a href="#444" id="444">444</a>
-<a href="#445" id="445">445</a></pre></div><pre class="rust"><code><span class="kw">use </span>glam::{Mat4, Vec3};
+<a href="#445" id="445">445</a>
+<a href="#446" id="446">446</a></pre></div><pre class="rust"><code><span class="kw">use </span>glam::{Mat4, Vec3};
 <span class="kw">use </span>std::mem;
 <span class="kw">use </span>std::time::Instant;
 <span class="kw">use </span>wgpu::util::{BufferInitDescriptor, DeviceExt};
@@ -884,6 +885,7 @@
         failures: Vec::new(),
         required_downlevel_caps:
             &lt;Example <span class="kw">as </span><span class="kw">crate</span>::framework::Example&gt;::required_downlevel_capabilities(),
+        ..Default::default()
     },
     comparisons: <span class="kw-2">&amp;</span>[wgpu_test::ComparisonType::Mean(<span class="number">0.02</span>)],
     _phantom: std::marker::PhantomData::&lt;Example&gt;,

doc/src/wgpu_examples/ray_shadows/mod.rs.html

@@ -195,9 +195,14 @@
 <a href="#194" id="194">194</a>
 <a href="#195" id="195">195</a>
 <a href="#196" id="196">196</a>
-<a href="#197" id="197">197</a></pre></div><pre class="rust"><code><span class="kw">use </span>wgpu::{Adapter, Backends, Device, Features, Instance, Limits, Queue};
+<a href="#197" id="197">197</a>
+<a href="#198" id="198">198</a>
+<a href="#199" id="199">199</a>
+<a href="#200" id="200">200</a>
+<a href="#201" id="201">201</a>
+<a href="#202" id="202">202</a></pre></div><pre class="rust"><code><span class="kw">use </span>wgpu::{Adapter, Backends, Device, Features, Instance, Limits, Queue};
 
-<span class="kw">use </span><span class="kw">crate</span>::report::AdapterReport;
+<span class="kw">use crate</span>::{report::AdapterReport, TestParameters};
 
 <span class="doccomment">/// Initialize the logger for the test runner.
 </span><span class="kw">pub fn </span>init_logger() {
@@ -209,7 +214,7 @@
 }
 
 <span class="doccomment">/// Initialize a wgpu instance with the options from the environment.
-</span><span class="kw">pub fn </span>initialize_instance(backends: wgpu::Backends, force_fxc: bool) -&gt; Instance {
+</span><span class="kw">pub fn </span>initialize_instance(backends: wgpu::Backends, params: <span class="kw-2">&amp;</span>TestParameters) -&gt; Instance {
     <span class="comment">// We ignore `WGPU_BACKEND` for now, merely using test filtering to only run a single backend's tests.
     //
     // We can potentially work support back into the test runner in the future, but as the adapters are matched up
@@ -227,14 +232,19 @@
     };
     <span class="comment">// Some tests need to be able to force demote to FXC, to specifically test workarounds for FXC
     // behavior.
-    </span><span class="kw">let </span>dx12_shader_compiler = <span class="kw">if </span>force_fxc {
+    </span><span class="kw">let </span>dx12_shader_compiler = <span class="kw">if </span>params.force_fxc {
         wgpu::Dx12Compiler::Fxc
     } <span class="kw">else </span>{
         wgpu::Dx12Compiler::from_env().unwrap_or(wgpu::Dx12Compiler::StaticDxc)
     };
+    <span class="comment">// The defaults for debugging, overridden by the environment, overridden by the test parameters.
+    </span><span class="kw">let </span>flags = wgpu::InstanceFlags::debugging()
+        .with_env()
+        .union(params.required_instance_flags);
+
     Instance::new(<span class="kw-2">&amp;</span>wgpu::InstanceDescriptor {
         backends,
-        flags: wgpu::InstanceFlags::debugging().with_env(),
+        flags,
         backend_options: wgpu::BackendOptions {
             dx12: wgpu::Dx12BackendOptions {
                 shader_compiler: dx12_shader_compiler,
@@ -262,13 +272,13 @@
 <span class="doccomment">/// Initialize a wgpu adapter, using the given adapter report to match the adapter.
 </span><span class="kw">pub async fn </span>initialize_adapter(
     adapter_report: <span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span>AdapterReport&gt;,
-    force_fxc: bool,
+    params: <span class="kw-2">&amp;</span>TestParameters,
 ) -&gt; (Instance, Adapter, <span class="prelude-ty">Option</span>&lt;SurfaceGuard&gt;) {
     <span class="kw">let </span>backends = adapter_report
         .map(|report| Backends::from(report.info.backend))
         .unwrap_or_default();
 
-    <span class="kw">let </span>instance = initialize_instance(backends, force_fxc);
+    <span class="kw">let </span>instance = initialize_instance(backends, params);
     <span class="attr">#[allow(unused_variables)]
     </span><span class="kw">let </span>surface: <span class="prelude-ty">Option</span>&lt;wgpu::Surface&gt;;
     <span class="kw">let </span>surface_guard: <span class="prelude-ty">Option</span>&lt;SurfaceGuard&gt;;

doc/src/wgpu_examples/ray_traced_triangle/mod.rs.html

@@ -180,8 +180,17 @@
 <a href="#179" id="179">179</a>
 <a href="#180" id="180">180</a>
 <a href="#181" id="181">181</a>
-<a href="#182" id="182">182</a></pre></div><pre class="rust"><code><span class="kw">use </span>arrayvec::ArrayVec;
-<span class="kw">use </span>wgpu::{DownlevelCapabilities, DownlevelFlags, Features, Limits};
+<a href="#182" id="182">182</a>
+<a href="#183" id="183">183</a>
+<a href="#184" id="184">184</a>
+<a href="#185" id="185">185</a>
+<a href="#186" id="186">186</a>
+<a href="#187" id="187">187</a>
+<a href="#188" id="188">188</a>
+<a href="#189" id="189">189</a>
+<a href="#190" id="190">190</a>
+<a href="#191" id="191">191</a></pre></div><pre class="rust"><code><span class="kw">use </span>arrayvec::ArrayVec;
+<span class="kw">use </span>wgpu::{DownlevelCapabilities, DownlevelFlags, Features, InstanceFlags, Limits};
 
 <span class="kw">use crate</span>::{
     report::AdapterReport, FailureApplicationReasons, FailureBehavior, FailureCase,
@@ -201,6 +210,8 @@
     <span class="kw">pub </span>required_downlevel_caps: DownlevelCapabilities,
     <span class="kw">pub </span>required_limits: Limits,
 
+    <span class="kw">pub </span>required_instance_flags: InstanceFlags,
+
     <span class="doccomment">/// On Dx12, specifically test against the Fxc compiler.
     ///
     /// For testing workarounds to Fxc bugs.
@@ -219,6 +230,7 @@
             required_features: Features::empty(),
             required_downlevel_caps: LOWEST_DOWNLEVEL_PROPERTIES,
             required_limits: Limits::downlevel_webgl2_defaults(),
+            required_instance_flags: InstanceFlags::empty(),
             force_fxc: <span class="bool-val">false</span>,
             skips: Vec::new(),
             failures: Vec::new(),
@@ -251,6 +263,12 @@
         <span class="self">self
     </span>}
 
+    <span class="doccomment">/// Sets the instance flags that the test requires.
+    </span><span class="kw">pub fn </span>instance_flags(<span class="kw-2">mut </span><span class="self">self</span>, instance_flags: InstanceFlags) -&gt; <span class="self">Self </span>{
+        <span class="self">self</span>.required_instance_flags |= instance_flags;
+        <span class="self">self
+    </span>}
+
     <span class="kw">pub fn </span>force_fxc(<span class="kw-2">mut </span><span class="self">self</span>, force_fxc: bool) -&gt; <span class="self">Self </span>{
         <span class="self">self</span>.force_fxc = force_fxc;
         <span class="self">self