From fe1a091bd01ae6194919e06a9ca6d24ae3e2ce12 Mon Sep 17 00:00:00 2001 From: Thomas Wagner Date: Wed, 11 Aug 2021 10:49:34 +0200 Subject: [PATCH] lavapipe: enable KHR_external_memory_fd Reviewed-by: Dave Airlie Tested-by: Heinrich Fink Part-of: --- docs/features.txt | 2 +- src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt | 1 - src/gallium/frontends/lavapipe/lvp_device.c | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index ea9d173ef9e..6dcf5dfe7d0 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -479,7 +479,7 @@ Khronos extensions that are not part of any Vulkan version: VK_KHR_display_swapchain not started VK_KHR_external_fence_fd DONE (anv, radv, tu, v3dv, vn) VK_KHR_external_fence_win32 not started - VK_KHR_external_memory_fd DONE (anv, radv, tu, v3dv, vn) + VK_KHR_external_memory_fd DONE (anv, lvp, radv, tu, v3dv, vn) VK_KHR_external_memory_win32 not started VK_KHR_external_semaphore_fd DONE (anv, radv, tu, v3dv, vn) VK_KHR_external_semaphore_win32 not started diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt index 1ab95fcfc7b..0d577fe1afb 100644 --- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt @@ -5,7 +5,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-multithread-texture,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail -glx@glx-tfp,Crash glx@glx-visuals-depth,Crash glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil,Crash diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 62141585359..aea2d3047af 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -104,6 +104,9 @@ static const struct vk_device_extension_table lvp_device_extensions_supported = .KHR_driver_properties = true, .KHR_external_fence = true, .KHR_external_memory = true, +#ifdef PIPE_MEMORY_FD + .KHR_external_memory_fd = true, +#endif .KHR_external_semaphore = true, .KHR_shader_float_controls = true, .KHR_get_memory_requirements2 = true,