From 67c3c06541f27a3f200fa64ecfbac2a6b9f5196a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 11 May 2020 10:52:18 +0200 Subject: [PATCH] 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 Acked-by: Bas Nieuwenhuizen Part-of: (cherry picked from commit 69430921fc123b9016d5bf1779c0ab0ed4d95931) --- .pick_status.json | 2 +- src/amd/vulkan/radv_extensions.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3eec1ba7755..275b0896a45 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -571,7 +571,7 @@ "description": "radv: limit the Vulkan version to 1.1 for Android", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7f5462e349a3f082e2944181cd610b1250d711cd" }, 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; }