fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: disable non AHB external memory bits on Android

Browse source 
We are allowed to enable them in theory. However, the non-AHB external
memory support in Venus is very broken at this moment.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21155>
This commit is contained in:
Yiwei Zhang 2023-02-07 05:31:58 +00:00 • committed by Marge Bot
parent 5c7e60362c
commit dba8bb08ac
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/virtio/vulkan/vn_physical_device.c
View file

@ -824,14 +824,14 @@ vn_physical_device_init_external_memory(
physical_dev->external_memory.renderer_handle_type = physical_dev->external_memory.renderer_handle_type =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT; VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
physical_dev->external_memory.supported_handle_types =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT |
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
#ifdef ANDROID #ifdef ANDROID
physical_dev->external_memory.supported_handle_types |= physical_dev->external_memory.supported_handle_types |=
VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID; VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
#endif #else /* ANDROID */
physical_dev->external_memory.supported_handle_types =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT |
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
#endif /* ANDROID */
} }
} }
@ -965,12 +965,12 @@ vn_physical_device_get_native_extensions(
VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT)) VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT))
exts->KHR_external_semaphore_fd = true; exts->KHR_external_semaphore_fd = true;
} }
#endif #else /* ANDROID */
if (can_external_mem) { if (can_external_mem) {
exts->KHR_external_memory_fd = true; exts->KHR_external_memory_fd = true;
exts->EXT_external_memory_dma_buf = true; exts->EXT_external_memory_dma_buf = true;
} }
#endif /* ANDROID */
/* Semaphore sync fd import required for WSI to skip scrubbing /* Semaphore sync fd import required for WSI to skip scrubbing
* the wsi/external wait semaphores. * the wsi/external wait semaphores.