Module: Mesa Branch: staging/23.3 Commit: 3474c9dfa98c87d459221de29ad6b3e94e0b2ff7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3474c9dfa98c87d459221de29ad6b3e94e0b2ff7
Author: Mary Guillemard <mary.guillem...@collabora.com> Date: Tue Nov 21 09:29:41 2023 +0100 zink: Always fill external_only in zink_query_dmabuf_modifiers Fix piglit.spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers randomly skipping some tests as external_only content was never initialized. Cc: mesa-stable Reviewed-by: default avatarMike Blumenkrantz <michael.blumenkra...@gmail.com> Signed-off-by: Mary Guillemard <mary.guillem...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26305> (cherry picked from commit b6d828576e1d561ad49c01f19c1cb5ba39e3832a) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index aa305342e20..acd34d40315 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -894,7 +894,7 @@ "description": "zink: Always fill external_only in zink_query_dmabuf_modifiers", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index bfb4fe59d74..cccc901df8f 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2455,8 +2455,12 @@ zink_query_dmabuf_modifiers(struct pipe_screen *pscreen, enum pipe_format format { struct zink_screen *screen = zink_screen(pscreen); *count = screen->modifier_props[format].drmFormatModifierCount; - for (int i = 0; i < MIN2(max, *count); i++) + for (int i = 0; i < MIN2(max, *count); i++) { + if (external_only) + external_only[i] = 0; + modifiers[i] = screen->modifier_props[format].pDrmFormatModifierProperties[i].drmFormatModifier; + } } static bool
