From ade42dfb0e10cbc940f03b98274a128c9d60e4f8 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Tue, 21 Nov 2023 09:17:16 +0100 Subject: [PATCH] zink: Initialize pQueueFamilyIndices for image query / create Fixes: d922850e365 ("zink: break out image/buffer create info structs into helper funcs") Signed-off-by: Mary Guillemard Reviewed-by: Mike Blumenkrantz Part-of: (cherry picked from commit db0f177edd793f30edee44c101bfdc7f9ea6e788) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 52e918a..c0eaca5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1274,7 +1274,7 @@ "description": "zink: Initialize pQueueFamilyIndices for image query / create", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d922850e365fc685c6ad57bdbba0abde5f6ed846", "notes": null diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 40a1b15..121663a 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -359,6 +359,7 @@ check_ici(struct zink_screen *screen, VkImageCreateInfo *ici, uint64_t modifier) mod_info.drmFormatModifier = modifier; mod_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; mod_info.queueFamilyIndexCount = 0; + mod_info.pQueueFamilyIndices = NULL; info.pNext = &mod_info; } @@ -697,6 +698,7 @@ init_ici(struct zink_screen *screen, VkImageCreateInfo *ici, const struct pipe_r ici->flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; ici->usage = 0; ici->queueFamilyIndexCount = 0; + ici->pQueueFamilyIndices = NULL; /* assume we're going to be doing some CompressedTexSubImage */ if (util_format_is_compressed(templ->format) && (ici->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) && -- 2.7.4