dzn: 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 <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17603>
This commit is contained in:
parent
ef7635b1cb
commit
bdf91b25d9
|
@ -46,7 +46,9 @@ dzn_meta_compile_shader(struct dzn_device *device, nir_shader *nir,
|
||||||
struct nir_to_dxil_options opts = {
|
struct nir_to_dxil_options opts = {
|
||||||
.environment = DXIL_ENVIRONMENT_VULKAN,
|
.environment = DXIL_ENVIRONMENT_VULKAN,
|
||||||
.shader_model_max = SHADER_MODEL_6_2,
|
.shader_model_max = SHADER_MODEL_6_2,
|
||||||
.validator_version_max = DXIL_VALIDATOR_1_4,
|
#ifdef _WIN32
|
||||||
|
.validator_version_max = dxil_get_validator_version(instance->dxil_validator),
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
struct blob dxil_blob;
|
struct blob dxil_blob;
|
||||||
ASSERTED bool ret = nir_to_dxil(nir, &opts, &dxil_blob);
|
ASSERTED bool ret = nir_to_dxil(nir, &opts, &dxil_blob);
|
||||||
|
|
|
@ -348,7 +348,9 @@ dzn_pipeline_compile_shader(struct dzn_device *device,
|
||||||
struct nir_to_dxil_options opts = {
|
struct nir_to_dxil_options opts = {
|
||||||
.environment = DXIL_ENVIRONMENT_VULKAN,
|
.environment = DXIL_ENVIRONMENT_VULKAN,
|
||||||
.shader_model_max = SHADER_MODEL_6_2,
|
.shader_model_max = SHADER_MODEL_6_2,
|
||||||
.validator_version_max = DXIL_VALIDATOR_1_4,
|
#ifdef _WIN32
|
||||||
|
.validator_version_max = dxil_get_validator_version(instance->dxil_validator),
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
struct blob dxil_blob;
|
struct blob dxil_blob;
|
||||||
VkResult result = VK_SUCCESS;
|
VkResult result = VK_SUCCESS;
|
||||||
|
|
Loading…
Reference in New Issue