Module: Mesa Branch: main Commit: 363ffdaf796d03810598b30ddcc3fa4f53c22bad URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=363ffdaf796d03810598b30ddcc3fa4f53c22bad
Author: Mike Blumenkrantz <[email protected]> Date: Fri Sep 17 15:51:15 2021 -0400 zink: don't use legacy scanout with modifiers legacy_scanout is for adding implicit modifiers when modifiers aren't provided, so it can't be used with explicit modifiers also jekstrand said no. Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12930> --- src/gallium/drivers/zink/zink_resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 81cd735a8d6..eff6315a29d 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -553,7 +553,8 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t .scanout = true, }; - if ((screen->needs_mesa_wsi || screen->needs_mesa_flush_wsi) && scanout) { + if ((screen->needs_mesa_wsi || screen->needs_mesa_flush_wsi) && scanout && + ici.tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) { image_wsi_info.pNext = ici.pNext; ici.pNext = &image_wsi_info; }
