From bcc962687da964f8b35a73d20a378c6fc91bfb9c Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Mon, 16 Dec 2024 10:14:35 -0500 Subject: [PATCH] Use Static-DXC for tests (#6730) --- tests/Cargo.toml | 2 +- tests/src/init.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 127226b0bd..410de588f9 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -45,7 +45,7 @@ serde_json.workspace = true serde.workspace = true strum = { workspace = true, features = ["derive"] } trybuild.workspace = true -wgpu = { workspace = true, features = ["wgsl"] } +wgpu = { workspace = true, features = ["wgsl", "static-dxc"] } wgpu-macros.workspace = true wgt = { workspace = true, features = ["serde"] } diff --git a/tests/src/init.rs b/tests/src/init.rs index 3644655bec..01548c0bdf 100644 --- a/tests/src/init.rs +++ b/tests/src/init.rs @@ -34,7 +34,7 @@ pub fn initialize_instance(backends: wgpu::Backends, force_fxc: bool) -> Instanc let dx12_shader_compiler = if force_fxc { wgpu::Dx12Compiler::Fxc } else { - wgpu::util::dx12_shader_compiler_from_env().unwrap_or_default() + wgpu::util::dx12_shader_compiler_from_env().unwrap_or(wgpu::Dx12Compiler::StaticDxc) }; let gles_minor_version = wgpu::util::gles_minor_version_from_env().unwrap_or_default(); Instance::new(wgpu::InstanceDescriptor {