fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: limit the Vulkan version to 1.1 for Android

Browse source 
Vulkan 1.2 seems rejected. This hardcodes the Android version to
1.1.107.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2936
Fixes: 7f5462e349 ("radv: enable Vulkan 1.2")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4985>
(cherry picked from commit 69430921fc)
This commit is contained in:
Samuel Pitoiset 2020-05-11 10:52:18 +02:00 • committed by Eric Engestrom
parent 464bbd6aaa
commit 67c3c06541
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

9
src/amd/vulkan/radv_extensions.py
View file

@ -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;
}