Module: Mesa Branch: staging/22.2 Commit: 086b44101c4fc1a562e3084f4febea38961c5736 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=086b44101c4fc1a562e3084f4febea38961c5736
Author: Yiwei Zhang <[email protected]> Date: Tue Aug 30 23:20:19 2022 +0000 venus: allow no external memory handle when renderers lacks support This is to make vtest happy. Fixes: 9c5a7ffbd8a ("venus: fix external memory ext filtering") Signed-off-by: Yiwei Zhang <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18331> (cherry picked from commit 0e0e5d1f204fc7c10a8686fe77cc1c9c0fef54f5) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d27ce5b7bb4..206af0ad751 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -7672,7 +7672,7 @@ "description": "venus: allow no external memory handle when renderers lacks support", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9c5a7ffbd8a696182647135ef32bddb347c277f2" }, diff --git a/src/virtio/vulkan/vn_device.c b/src/virtio/vulkan/vn_device.c index 25dd97e973d..ae696ba8bbc 100644 --- a/src/virtio/vulkan/vn_device.c +++ b/src/virtio/vulkan/vn_device.c @@ -286,7 +286,7 @@ vn_device_fix_create_info(const struct vn_device *dev, } break; default: - unreachable("unexpected external memory handle type"); + assert(!physical_dev->instance->renderer->info.has_dma_buf_import); break; } }
