From 5b9c526c55c3a23eefd5c7ca40dd00d5c2bc5a28 Mon Sep 17 00:00:00 2001
From: teoxoy <28601907+teoxoy@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:25:37 +0100
Subject: [PATCH] [d3d12] don't expose adapter if it doesn't support DXIL when
the DXC container is present
---
wgpu-hal/src/dx12/adapter.rs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/wgpu-hal/src/dx12/adapter.rs b/wgpu-hal/src/dx12/adapter.rs
index b88941c81..eb4bfa514 100644
--- a/wgpu-hal/src/dx12/adapter.rs
+++ b/wgpu-hal/src/dx12/adapter.rs
@@ -207,10 +207,10 @@ impl super::Adapter {
Direct3D12::D3D_SHADER_MODEL_6_2,
Direct3D12::D3D_SHADER_MODEL_6_1,
Direct3D12::D3D_SHADER_MODEL_6_0,
- Direct3D12::D3D_SHADER_MODEL_5_1,
]
.iter();
- match loop {
+
+ let highest_shader_model = loop {
if let Some(&sm) = versions.next() {
let mut sm = Direct3D12::D3D12_FEATURE_DATA_SHADER_MODEL {
HighestShaderModel: sm,
@@ -229,8 +229,10 @@ impl super::Adapter {
} else {
break Direct3D12::D3D_SHADER_MODEL_5_1;
}
- } {
- Direct3D12::D3D_SHADER_MODEL_5_1 => naga::back::hlsl::ShaderModel::V5_1,
+ };
+
+ match highest_shader_model {
+ Direct3D12::D3D_SHADER_MODEL_5_1 => return None, // don't expose this adapter if it doesn't support DXIL
Direct3D12::D3D_SHADER_MODEL_6_0 => naga::back::hlsl::ShaderModel::V6_0,
Direct3D12::D3D_SHADER_MODEL_6_1 => naga::back::hlsl::ShaderModel::V6_1,
Direct3D12::D3D_SHADER_MODEL_6_2 => naga::back::hlsl::ShaderModel::V6_2,