OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: re-enable 1.4 support

Browse Source 
Have made core venus protocol update to be able to support host image
copy.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33757>
This commit is contained in:
Yiwei Zhang
2025-02-26 00:35:45 -08:00
committed by Marge Bot
parent 577fa1793d
commit bef1c23a23
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/features.txt
View File

@@ -509,7 +509,7 @@ Vulkan 1.3 -- all DONE: anv, lvp, nvk, radv, tu, vn, v3dv
VK_EXT_tooling_info DONE (anv, hasvk, nvk, panvk, pvr, radv, tu, v3dv, vn)
VK_EXT_ycbcr_2plane_444_formats DONE (anv, lvp, nvk, panvk/v10+, vn)
Vulkan 1.4 -- all DONE: anv, lvp, nvk, radv/gfx8+, tu/a7xx+
Vulkan 1.4 -- all DONE: anv, lvp, nvk, radv/gfx8+, tu/a7xx+, vn
VK_KHR_dynamic_rendering_local_read DONE (anv, lvp, nvk, radv, tu, vn)
VK_KHR_global_priority DONE (anv, lvp, nvk, panvk, radv, tu, vn)

14
src/virtio/vulkan/vn_instance.h
View File

@@ -20,16 +20,12 @@
#define VN_MIN_RENDERER_VERSION VK_API_VERSION_1_1
/* max advertised version at both instance and device levels */
#ifdef ANDROID_STRICT
#if ANDROID_API_LEVEL < 33
#if !defined(ANDROID_STRICT) || ANDROID_API_LEVEL >= 36
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 4, VK_HEADER_VERSION)
#elif ANDROID_API_LEVEL >= 33
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION)
#else
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION)
#elif ANDROID_API_LEVEL < 36
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION)
#else /* ANDROID_API_LEVEL >= 36 */
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION)
#endif
#else /* ANDROID_STRICT */
#define VN_MAX_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION)
#endif
struct vn_instance {

7
src/virtio/vulkan/vn_physical_device.c
View File

@@ -387,6 +387,13 @@ vn_physical_device_sanitize_properties(struct vn_physical_device *physical_dev)
ver - VK_VERSION_PATCH(ver) + VK_VERSION_PATCH(props->apiVersion);
}
/* Clamp to 1.3 if proper passthrough for VK_EXT_host_image_copy is not
* supported at the protocol level. It requires venus protocol v3.
* See vn_physical_device_get_passthrough_extensions()
*/
if (instance->renderer->info.vk_mesa_venus_protocol_spec_version < 3)
ver = MIN2(VK_API_VERSION_1_3, ver);
/* Clamp to 1.2 if we disabled VK_KHR_synchronization2 since it
* is required for 1.3.
* See vn_physical_device_get_passthrough_extensions()