diff --git a/tests/tests/wgpu-validation/api/experimental.rs b/tests/tests/wgpu-validation/api/experimental.rs index 7d6bd2712..c3acc49c2 100644 --- a/tests/tests/wgpu-validation/api/experimental.rs +++ b/tests/tests/wgpu-validation/api/experimental.rs @@ -2,7 +2,7 @@ fn noop_adapter() -> wgpu::Adapter { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::NOOP, backend_options: wgpu::BackendOptions { - noop: wgpu::NoopBackendOptions { enable: true }, + noop: wgpu::NoopBackendOptions::enabled(), ..Default::default() }, ..wgpu::InstanceDescriptor::new_without_display_handle() diff --git a/tests/tests/wgpu-validation/noop.rs b/tests/tests/wgpu-validation/noop.rs index 1922c5a3b..1bc1fd5b3 100644 --- a/tests/tests/wgpu-validation/noop.rs +++ b/tests/tests/wgpu-validation/noop.rs @@ -19,7 +19,7 @@ fn device_is_available_when_requested() { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::NOOP, backend_options: wgpu::BackendOptions { - noop: wgpu::NoopBackendOptions { enable: true }, + noop: wgpu::NoopBackendOptions::enabled(), ..Default::default() }, ..wgpu::InstanceDescriptor::new_without_display_handle() diff --git a/tests/tests/wgpu_trace.rs b/tests/tests/wgpu_trace.rs index 1ff597ba3..3da1a0891 100644 --- a/tests/tests/wgpu_trace.rs +++ b/tests/tests/wgpu_trace.rs @@ -20,7 +20,7 @@ fn trace_test(test_type: TestType) { wgt::instance::InstanceDescriptor { backends: wgt::Backends::NOOP, backend_options: wgt::BackendOptions { - noop: wgt::NoopBackendOptions { enable: true }, + noop: wgt::NoopBackendOptions::enabled(), ..Default::default() }, ..wgt::instance::InstanceDescriptor::new_without_display_handle() diff --git a/wgpu-types/src/backend.rs b/wgpu-types/src/backend.rs index a0dd58b87..a035de337 100644 --- a/wgpu-types/src/backend.rs +++ b/wgpu-types/src/backend.rs @@ -613,6 +613,11 @@ pub struct NoopBackendOptions { } impl NoopBackendOptions { + /// Enable the noop backend. + pub fn enabled() -> Self { + Self { enable: true } + } + /// Choose whether the noop backend is enabled from the environment. /// /// It will be enabled if the environment variable `WGPU_NOOP_BACKEND` has the value `1` diff --git a/wgpu/src/api/device.rs b/wgpu/src/api/device.rs index 56136d0c4..6f533aa26 100644 --- a/wgpu/src/api/device.rs +++ b/wgpu/src/api/device.rs @@ -63,7 +63,7 @@ impl Device { let instance = Instance::new(InstanceDescriptor { backends: Backends::NOOP, backend_options: BackendOptions { - noop: NoopBackendOptions { enable: true }, + noop: NoopBackendOptions::enabled(), ..Default::default() }, ..InstanceDescriptor::new_without_display_handle()