Module: Mesa Branch: main Commit: 7d2de968474f98ee15357dd64764d280de6b0640 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d2de968474f98ee15357dd64764d280de6b0640
Author: Mike Blumenkrantz <[email protected]> Date: Thu Sep 9 20:44:35 2021 -0400 zink: fix import pNext attachment during image creation there's better checks for this now, so the weird pNext handling here can be simplified Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11967> --- src/gallium/drivers/zink/zink_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 74cccaad910..824132318d3 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -633,7 +633,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t NULL, }; - if (whandle && whandle->type == WINSYS_HANDLE_TYPE_FD) { + if (whandle) { imfi.pNext = NULL; imfi.handleType = external; imfi.fd = os_dupfd_cloexec(whandle->handle); @@ -643,7 +643,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t } imfi.pNext = mai.pNext; - emai.pNext = &imfi; + mai.pNext = &imfi; } struct wsi_memory_allocate_info memory_wsi_info = {
