From 27fb80d64daca9a0502bc824a37366b066a960d3 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 8 Aug 2022 18:19:03 +0000 Subject: [PATCH] venus: fix external memory ext filtering Fixes: 390722620e1 ("venus: clean up vn_device_fix_create_info") Signed-off-by: Yiwei Zhang Part-of: (cherry picked from commit 9c5a7ffbd8a696182647135ef32bddb347c277f2) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_device.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7a925ac80e0..b1eb18797d4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -10921,7 +10921,7 @@ "description": "venus: fix external memory ext filtering", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "390722620e139047c6b94f394caebb4c5676e6ce" }, diff --git a/src/virtio/vulkan/vn_device.c b/src/virtio/vulkan/vn_device.c index 9b65b06026e..25dd97e973d 100644 --- a/src/virtio/vulkan/vn_device.c +++ b/src/virtio/vulkan/vn_device.c @@ -270,15 +270,23 @@ vn_device_fix_create_info(const struct vn_device *dev, extra_exts[extra_count++] = VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME; } - FALLTHROUGH; + if (!app_exts->KHR_external_memory_fd) { + extra_exts[extra_count++] = + VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; + } + break; case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT: + if (app_exts->EXT_external_memory_dma_buf) { + block_exts[block_count++] = + VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME; + } if (!app_exts->KHR_external_memory_fd) { extra_exts[extra_count++] = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; } break; default: - /* TODO other handle types */ + unreachable("unexpected external memory handle type"); break; } }