microsoft/spirv2dxil: Change spirv_to_dxil() to receive SM and validator versions

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19227>
This commit is contained in:
Pedro J. Estébanez
2022-10-21 14:21:23 +02:00
committed by Marge Bot
parent 0bf5bbb3e4
commit 811794f8d8
3 changed files with 7 additions and 2 deletions
+1
View File
@@ -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)) {
+4 -2
View File
@@ -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();
@@ -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,