Module: Mesa Branch: staging/20.0 Commit: cfcb3a0e8394649381a6581a9a1744b345beaf67 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfcb3a0e8394649381a6581a9a1744b345beaf67
Author: Samuel Pitoiset <[email protected]> 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 <[email protected]> Acked-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4985> (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 e35ba3eb7c8..60ea7967317 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,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 a5127b33a34..d29c0e0009c 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -368,8 +368,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; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
