From a32d6071e15a6fc2019ff34f7914e3fe17f24385 Mon Sep 17 00:00:00 2001 From: Caleb Cornett Date: Wed, 18 Jan 2023 10:36:36 -0500 Subject: [PATCH] d3d12: Lower minimum supported Shader Model to 6.0 Part-of: --- src/gallium/drivers/d3d12/d3d12_screen.cpp | 2 +- src/microsoft/compiler/nir_to_dxil.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index e9aca69819f..5eb19b9b1ba 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -1408,7 +1408,7 @@ d3d12_init_screen(struct d3d12_screen *screen, IUnknown *adapter) static const D3D_SHADER_MODEL valid_shader_models[] = { D3D_SHADER_MODEL_6_7, D3D_SHADER_MODEL_6_6, D3D_SHADER_MODEL_6_5, D3D_SHADER_MODEL_6_4, - D3D_SHADER_MODEL_6_3, D3D_SHADER_MODEL_6_2, D3D_SHADER_MODEL_6_1, + D3D_SHADER_MODEL_6_3, D3D_SHADER_MODEL_6_2, D3D_SHADER_MODEL_6_1, D3D_SHADER_MODEL_6_0, }; for (UINT i = 0; i < ARRAY_SIZE(valid_shader_models); ++i) { D3D12_FEATURE_DATA_SHADER_MODEL shader_model = { valid_shader_models[i] }; diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c index 3994c636f1d..1f08f2b35b2 100644 --- a/src/microsoft/compiler/nir_to_dxil.c +++ b/src/microsoft/compiler/nir_to_dxil.c @@ -6084,7 +6084,7 @@ type_size_vec4(const struct glsl_type *type, bool bindless) static const unsigned dxil_validator_min_capable_version = DXIL_VALIDATOR_1_4; static const unsigned dxil_validator_max_capable_version = DXIL_VALIDATOR_1_7; -static const unsigned dxil_min_shader_model = SHADER_MODEL_6_1; +static const unsigned dxil_min_shader_model = SHADER_MODEL_6_0; static const unsigned dxil_max_shader_model = SHADER_MODEL_6_7; bool