Mesa (master): radv: limit the Vulkan version to 1.1 for Android
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 12 09:01:48 UTC 2020
Module: Mesa
Branch: master
Commit: 69430921fc123b9016d5bf1779c0ab0ed4d95931
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69430921fc123b9016d5bf1779c0ab0ed4d95931
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Mon May 11 10:52:18 2020 +0200
radv: limit the Vulkan version to 1.1 for Android
Vulkan 1.2 seems rejected. This hardcodes the Android version to
1.1.107.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2936
Fixes: 7f5462e349a ("radv: enable Vulkan 1.2")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Acked-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4985>
---
src/amd/vulkan/radv_extensions.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index f181c133364..4ea75a10d57 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -452,8 +452,13 @@ 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)
- version = ${MAX_API_VERSION.c_vk_version()};
+ if (dev->rad_info.has_syncobj_wait_for_submit) {
+ if (ANDROID) {
+ version = VK_MAKE_VERSION(1, 1, 107);
+ } else {
+ version = ${MAX_API_VERSION.c_vk_version()};
+ }
+ }
return override ? MIN2(override, version) : version;
}
More information about the mesa-commit
mailing list