debug_printf: fix feature logic for DX12

gfx-rs · Dec 28, 2023 · 122f029 · 122f029
1 parent 7f545d5
commit 122f029
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/wgpu-hal/src/dx12/adapter.rs b/wgpu-hal/src/dx12/adapter.rs
@@ -297,6 +297,10 @@ impl super::Adapter {
  // float32-filterable should always be available on d3d12
  features.set(wgt::Features::FLOAT32_FILTERABLE, true);
 
+ // DXC lacks support for printf, so only enable it on FXC
+ // see https://github.com/microsoft/DirectXShaderCompiler/issues/357
+ features.set(wgt::Features::DEBUG_PRINTF, dxc_container.is_none());
+
  // TODO: Determine if IPresentationManager is supported
  let presentation_timer = auxil::dxgi::time::PresentationTimer::new_dxgi();
 

diff --git a/wgpu-hal/src/dx12/device.rs b/wgpu-hal/src/dx12/device.rs
@@ -1053,7 +1053,11 @@ impl crate::Device<super::Api> for super::Device {
  // FXC doesn't support SM 6.0
  None => hlsl::ShaderModel::V5_1,
  },
- flags: hlsl::WriterFlags::default(),
+ flags: match self.dxc_container {
+ // DXC doesn't support printf: https://github.com/microsoft/DirectXShaderCompiler/issues/357
+ Some(_) => hlsl::WriterFlags::empty(),
+ None => hlsl::WriterFlags::EMIT_DEBUG_PRINTF,
+ },
  binding_map,
  fake_missing_bindings: false,
  special_constants_binding,

diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs
@@ -794,7 +794,7 @@ bitflags::bitflags! {
  ///
  /// Supported Platforms:
  /// - DX11 (fxc only)
- /// - Dx12 (fxc only)
+ /// - DX12 (fxc only)
  /// - Vulkan
  /// - OpenGL
  ///