Module: Mesa Branch: main Commit: dba8bb08ac69a3a57c5cfe24015e25bd72a8f71a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dba8bb08ac69a3a57c5cfe24015e25bd72a8f71a
Author: Yiwei Zhang <[email protected]> Date: Tue Feb 7 05:31:58 2023 +0000 venus: disable non AHB external memory bits on Android 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21155> --- src/virtio/vulkan/vn_physical_device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c index bc5558193cc..c3b5078b1b6 100644 --- a/src/virtio/vulkan/vn_physical_device.c +++ b/src/virtio/vulkan/vn_physical_device.c @@ -824,14 +824,14 @@ vn_physical_device_init_external_memory( physical_dev->external_memory.renderer_handle_type = 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 physical_dev->external_memory.supported_handle_types |= 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)) exts->KHR_external_semaphore_fd = true; } -#endif - +#else /* ANDROID */ if (can_external_mem) { exts->KHR_external_memory_fd = true; exts->EXT_external_memory_dma_buf = true; } +#endif /* ANDROID */ /* Semaphore sync fd import required for WSI to skip scrubbing * the wsi/external wait semaphores.
