panvk: advertise version 1.1 support

We know we have a broken Vulkan driver, so it's debatable whether it's
a broken Vulkan 1.0 or broken 1.1. Advertising 1.1 lets us run more
tests, and this patch does this. We also bump the instance version id
to 1.4, which seems appropriate since the overall Vulkan infrastructure
within Mesa is at that level.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32464>
This commit is contained in:
Eric R. Smith 2024-12-03 16:14:47 -04:00 committed by Marge Bot
parent 2627d793a2
commit a6e03ce428
4 changed files with 6 additions and 11 deletions

View file

@ -272,12 +272,6 @@ dEQP-VK.texture.filtering.3d.formats.d32_sfloat_s8_uint_stencil.d32_sfloat_s8_ui
dEQP-VK.api.device_init.create_device_unsupported_features.shader_draw_parameters_features,Fail
dEQP-VK.api.device_init.create_device_unsupported_features.protected_memory_features,Fail
# CTS bug, works fine if Vulkan 1.1 is forced
dEQP-VK.api.device_init.create_device_global_priority.basic,Fail
dEQP-VK.api.device_init.create_device_global_priority_khr.basic,Fail
dEQP-VK.api.device_init.create_device_global_priority_query.basic,Fail
dEQP-VK.api.device_init.create_device_global_priority_query_khr.basic,Fail
dEQP-VK.draw.renderpass.linear_interpolation.no_offset_1_sample,Fail
dEQP-VK.draw.renderpass.linear_interpolation.no_offset_4_samples,Fail
dEQP-VK.draw.renderpass.linear_interpolation.offset_max_1_sample,Fail

View file

@ -187,7 +187,7 @@ panfrost_icd = custom_target(
output : 'panfrost_icd.@0@.json'.format(host_machine.cpu()),
command : [
prog_python, '@INPUT0@',
'--api-version', '1.0', '--xml', '@INPUT1@',
'--api-version', '1.4', '--xml', '@INPUT1@',
'--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
'libvulkan_panfrost.so'),
'--out', '@OUTPUT@',
@ -205,7 +205,7 @@ _dev_icd = custom_target(
output : _dev_icdname,
command : [
prog_python, '@INPUT0@',
'--api-version', '1.0', '--xml', '@INPUT1@',
'--api-version', '1.4', '--xml', '@INPUT1@',
'--lib-path', meson.current_build_dir() / 'libvulkan_panfrost.so',
'--out', '@OUTPUT@',
],

View file

@ -47,7 +47,7 @@ panvk_EnumerateInstanceVersion(uint32_t *pApiVersion)
{
uint32_t version_override = vk_get_version_override();
*pApiVersion = version_override ? version_override :
VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION);
VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION);
return VK_SUCCESS;
}

View file

@ -69,8 +69,9 @@ panvk_get_vk_version(unsigned arch)
const uint32_t version_override = vk_get_version_override();
if (version_override)
return version_override;
return VK_MAKE_API_VERSION(0, 1, 0, VK_HEADER_VERSION);
if (arch < 10)
return VK_MAKE_API_VERSION(0, 1, 0, VK_HEADER_VERSION);
return VK_MAKE_API_VERSION(0, 1, 1, VK_HEADER_VERSION);
}
VkResult panvk_physical_device_init(struct panvk_physical_device *device,