commit 3e4c3b8c8a853b8c551150c6946672f734335307
author Yiwei Zhang <zzyiwei@chromium.org> Thu Apr 15 22:55:31 2021 +0000
committer Yiwei Zhang <zzyiwei@chromium.org> Fri Apr 16 00:12:38 2021 +0000
tree 654f08d4ad505536cfa9edd662df44e2a800d55f
parent 508ff68b3f164bc7c3f41aed2e6d191c1e42592a

vkr: use virgl_resource_export_fd to get fd and type

The resource can be pipe_resource in our use cases.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>

src/vkr_renderer.c

diff --git a/src/vkr_renderer.c b/src/vkr_renderer.c
index 1797c79..7dee52b 100644
--- a/src/vkr_renderer.c
+++ b/src/vkr_renderer.c
@@ -3305,8 +3305,11 @@
       return;
    }
 
+   int fd = -1;
+   enum virgl_resource_fd_type fd_type = virgl_resource_export_fd(att->resource, &fd);
    VkExternalMemoryHandleTypeFlagBits handle_type;
-   if (!vkr_get_fd_handle_type_from_virgl_fd_type(dev->physical_device, att->resource->fd_type, &handle_type)) {
+   if (!vkr_get_fd_handle_type_from_virgl_fd_type(dev->physical_device, fd_type, &handle_type)) {
+      close(fd);
       args->ret = VK_ERROR_INVALID_EXTERNAL_HANDLE;
       return;
    }
@@ -3317,8 +3320,9 @@
       .memoryTypeBits = 0,
    };
    vn_replace_vkGetMemoryResourcePropertiesMESA_args_handle(args);
-   args->ret = dev->get_memory_fd_properties(args->device, handle_type, att->resource->fd, &memory_fd_properties);
+   args->ret = dev->get_memory_fd_properties(args->device, handle_type, fd, &memory_fd_properties);
    args->pMemoryResourceProperties->memoryTypeBits = memory_fd_properties.memoryTypeBits;
+   close(fd);
 }
 
 static void