Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

fix(windows): WGPU_DX12_COMPILER still overrides the FXC pin (#418)

Jareera9b2df616b12
diff --git a/src/crates/concat-render/src/gpu.rs b/src/crates/concat-render/src/gpu.rs
index 7db6c377..805ea693 100644
--- a/src/crates/concat-render/src/gpu.rs
+++ b/src/crates/concat-render/src/gpu.rs
@@ -856,8 +856,10 @@ impl WgpuCompositor {
// another Electron app's - and a build that does not match wgpu, or
// needs instructions the CPU lacks, kills the process at the first
// shader (0xc000001d). FXC is in System32 and is what every machine
- // without a stray DXC already compiles with (#418).
- descriptor.backend_options.dx12.shader_compiler = wgpu::Dx12Compiler::Fxc;
+ // without a stray DXC already compiles with (#418). WGPU_DX12_COMPILER
+ // still picks another, for trying DXC on a real GPU (#297).
+ descriptor.backend_options.dx12.shader_compiler =
+ wgpu::Dx12Compiler::from_env().unwrap_or(wgpu::Dx12Compiler::Fxc);
let instance = wgpu::Instance::new(descriptor);
let choices: &[bool] = if software_only {
&[true]
diff --git a/src/crates/concat/src/gpu.rs b/src/crates/concat/src/gpu.rs
index 7107bda5..74fd1c4f 100644
--- a/src/crates/concat/src/gpu.rs
+++ b/src/crates/concat/src/gpu.rs
@@ -64,8 +64,10 @@ impl Gpu {
// another Electron app's - and a build that does not match wgpu, or
// needs instructions the CPU lacks, kills the process at the first
// shader (0xc000001d). FXC is in System32 and is what every machine
- // without a stray DXC already compiles with (#418).
- descriptor.backend_options.dx12.shader_compiler = wgpu::Dx12Compiler::Fxc;
+ // without a stray DXC already compiles with (#418). WGPU_DX12_COMPILER
+ // still picks another, for trying DXC on a real GPU (#297).
+ descriptor.backend_options.dx12.shader_compiler =
+ wgpu::Dx12Compiler::from_env().unwrap_or(wgpu::Dx12Compiler::Fxc);
let instance = wgpu::Instance::new(descriptor);
// CONCAT_GPU=software opens the software rasteriser - WARP on
// Windows, lavapipe on Linux - in place of the GPU: the way round a