nvk: Advertise Vulkan 1.4

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32433>
This commit is contained in:
Faith Ekstrand 2024-09-10 13:39:59 -05:00 committed by Marge Bot
parent dbf4424d07
commit 173171f73e
3 changed files with 5 additions and 5 deletions

View file

@ -151,7 +151,7 @@ nouveau_icd = custom_target(
output : 'nouveau_icd.@0@.json'.format(host_machine.cpu()),
command : [
prog_python, '@INPUT0@',
'--api-version', '1.3', '--xml', '@INPUT1@',
'--api-version', '1.4', '--xml', '@INPUT1@',
'--lib-path', join_paths(icd_lib_path, icd_file_name),
'--out', '@OUTPUT@',
],
@ -168,7 +168,7 @@ custom_target(
output : _dev_icdname,
command : [
prog_python, '@INPUT0@',
'--api-version', '1.3', '--xml', '@INPUT1@',
'--api-version', '1.4', '--xml', '@INPUT1@',
'--lib-path', meson.current_build_dir() / icd_file_name,
'--out', '@OUTPUT@',
],

View file

@ -25,7 +25,7 @@ nvk_EnumerateInstanceVersion(uint32_t *pApiVersion)
{
uint32_t version_override = vk_get_version_override();
*pApiVersion = version_override ? version_override :
VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION);
VK_MAKE_VERSION(1, 4, VK_HEADER_VERSION);
return VK_SUCCESS;
}

View file

@ -85,7 +85,7 @@ nvk_get_vk_version(const struct nv_device_info *info)
return VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION);
#endif
return VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION);
return VK_MAKE_VERSION(1, 4, VK_HEADER_VERSION);
}
static void
@ -887,7 +887,7 @@ nvk_get_device_properties(const struct nvk_instance *instance,
.independentResolve = true,
.driverID = VK_DRIVER_ID_MESA_NVK,
.conformanceVersion =
conformant ? (VkConformanceVersion) { 1, 3, 7, 3 }
conformant ? (VkConformanceVersion) { 1, 4, 0, 0 }
: (VkConformanceVersion) { 0, 0, 0, 0 },
.denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL,
.roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL,