diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-11-11 12:23:29 -0500 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-12-01 18:55:46 +0000 |
| commit | a379268693a6889e3f4ac650907960b6e1c1fb0a (patch) | |
| tree | 8ed913bb2e8b1e8c48fa22a16688174567c6fafc | |
| parent | 6c90e1f8c47838b9f6ac728f268ed5b1aaab39d8 (diff) | |
zink: always set matching resource export type for dmabuf creation
both of these need to be set if one is
cc: mesa-stable
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13799>
(cherry picked from commit 943f6a038db868004d118db128564dd2e5c6e650)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_resource.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1cd72541456..da390895458 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2695,7 +2695,7 @@ "description": "zink: always set matching resource export type for dmabuf creation", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 4549874a8e3..71a9d0a4b38 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -446,21 +446,20 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t VkMemoryRequirements reqs; VkMemoryPropertyFlags flags; bool need_dedicated = false; + bool shared = templ->bind & PIPE_BIND_SHARED; VkExternalMemoryHandleTypeFlags export_types = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; VkExternalMemoryHandleTypeFlags external = 0; if (whandle) { - if (whandle->type == WINSYS_HANDLE_TYPE_FD) + if (whandle->type == WINSYS_HANDLE_TYPE_FD) { external = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT; - else + export_types |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT; + } else unreachable("unknown handle type"); } /* TODO: remove linear for wsi */ bool scanout = templ->bind & PIPE_BIND_SCANOUT; - bool shared = templ->bind & PIPE_BIND_SHARED; - if (shared && screen->info.have_EXT_external_memory_dma_buf) - export_types |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT; pipe_reference_init(&obj->reference, 1); util_dynarray_init(&obj->tmp, NULL); |