From ef7635b1cb419b6827cc6279b52f10c708f91f70 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Sun, 17 Jul 2022 11:08:13 -0700 Subject: [PATCH] d3d12: Retrieve validator version For platforms where there's no validator available, leave the field zero-initialized to let the DXIL backend choose whatever target validator version it wants. Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/d3d12/d3d12_compiler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/d3d12/d3d12_compiler.cpp b/src/gallium/drivers/d3d12/d3d12_compiler.cpp index 60f6761c002..facd2f6640e 100644 --- a/src/gallium/drivers/d3d12/d3d12_compiler.cpp +++ b/src/gallium/drivers/d3d12/d3d12_compiler.cpp @@ -149,7 +149,9 @@ compile_nir(struct d3d12_context *ctx, struct d3d12_shader_selector *sel, opts.input_clip_size = key->input_clip_size; opts.environment = DXIL_ENVIRONMENT_GL; opts.shader_model_max = SHADER_MODEL_6_2; - opts.validator_version_max = DXIL_VALIDATOR_1_4; +#ifdef _WIN32 + opts.validator_version_max = dxil_get_validator_version(ctx->dxil_validator); +#endif struct blob tmp; if (!nir_to_dxil(nir, &opts, &tmp)) {