diff --git a/src/microsoft/spirv_to_dxil/spirv2dxil.c b/src/microsoft/spirv_to_dxil/spirv2dxil.c index 6c700f89c8a..8bcdbcb4453 100644 --- a/src/microsoft/spirv_to_dxil/spirv2dxil.c +++ b/src/microsoft/spirv_to_dxil/spirv2dxil.c @@ -157,6 +157,7 @@ main(int argc, char **argv) memset(&obj, 0, sizeof(obj)); if (spirv_to_dxil((uint32_t *)file_contents, word_count, NULL, 0, (dxil_spirv_shader_stage)shader_stage, entry_point, + SHADER_MODEL_6_2, DXIL_VALIDATOR_1_4, &dbg_opts, &conf, &logger, &obj)) { if (validate && !validate_dxil(&obj)) { diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c index 994b8499f8d..d14241fddbd 100644 --- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c +++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c @@ -94,6 +94,8 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, struct dxil_spirv_specialization *specializations, unsigned int num_specializations, dxil_spirv_shader_stage stage, const char *entry_point_name, + enum dxil_shader_model shader_model_max, + enum dxil_validator_version validator_version_max, const struct dxil_spirv_debug_options *dgb_opts, const struct dxil_spirv_runtime_conf *conf, const struct dxil_spirv_logger *logger, @@ -121,8 +123,8 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, struct nir_to_dxil_options opts = { .environment = DXIL_ENVIRONMENT_VULKAN, - .shader_model_max = SHADER_MODEL_6_2, - .validator_version_max = DXIL_VALIDATOR_1_4, + .shader_model_max = shader_model_max, + .validator_version_max = validator_version_max, }; struct nir_shader_compiler_options nir_options = *dxil_get_nir_compiler_options(); diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.h b/src/microsoft/spirv_to_dxil/spirv_to_dxil.h index 345b5467f6f..8160f1cae9d 100644 --- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.h +++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.h @@ -189,6 +189,8 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, struct dxil_spirv_specialization *specializations, unsigned int num_specializations, dxil_spirv_shader_stage stage, const char *entry_point_name, + enum dxil_shader_model shader_model_max, + enum dxil_validator_version validator_version_max, const struct dxil_spirv_debug_options *debug_options, const struct dxil_spirv_runtime_conf *conf, const struct dxil_spirv_logger *logger,