radv: consider MESA_VK_VERSION_OVERRIDE when setting the api version

Graphics / Mesa 3D Graphics Library / Mesa - Eleni Maria Stea [igalia.com] - 29 April 2019 07:00 EDT

Before setting the physical device API version, we should check if the MESA_VK_VERSION_OVERRIDE environment variable is set and take it into account.

###

diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index d56d64b2dcb..23e76bfcc11 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -335,9 +335,12 @@ VkResult radv_EnumerateInstanceVersion(
uint32_t
radv_physical_device_api_version(struct radv_physical_device *dev)
{
+ uint32_t override = vk_get_version_override();
+ uint32_t version = VK_MAKE_VERSION(1, 0, 68);
if (dev->rad_info.has_syncobj_wait_for_submit)
- return ${MAX_API_VERSION.c_vk_version()};
- return VK_MAKE_VERSION(1, 0, 68);
+ version = ${MAX_API_VERSION.c_vk_version()};
+
+ return override ? MIN2(override, version) : version;
}
""")

bb953de96c7 radv: consider MESA_VK_VERSION_OVERRIDE when setting the api version
src/amd/vulkan/radv_extensions.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

Upstream: cgit.freedesktop.org


  • Share