Module: Mesa Branch: main Commit: c03f6967ccce522d219cf7d095aa95bcc0062d6d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c03f6967ccce522d219cf7d095aa95bcc0062d6d
Author: Mike Blumenkrantz <[email protected]> Date: Fri Apr 29 11:00:12 2022 -0400 zink: fix conditional for modifier usage the shared check here was inaccurate; if the resource has dmabuf export, then use modifiers Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16252> --- src/gallium/drivers/zink/zink_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 0408993aaaf..4f5690b3650 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -551,7 +551,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t obj->is_buffer = true; obj->transfer_dst = true; } else { - bool winsys_modifier = shared && whandle && whandle->modifier != DRM_FORMAT_MOD_INVALID; + bool winsys_modifier = (export_types & VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT) && whandle && whandle->modifier != DRM_FORMAT_MOD_INVALID; const uint64_t *ici_modifiers = winsys_modifier ? &whandle->modifier : modifiers; unsigned ici_modifier_count = winsys_modifier ? 1 : modifiers_count; bool success = false;
