diff options
| author | Mary Guillemard <mary.guillemard@collabora.com> | 2023-11-21 09:17:16 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-01-09 17:31:42 +0000 |
| commit | ade42dfb0e10cbc940f03b98274a128c9d60e4f8 (patch) | |
| tree | 9bad00b7c2869e193b20ab161b7c2636e3301c09 | |
| parent | cff9bdc316ea01b08fbeb0a006b06c287e457b91 (diff) | |
| download | mesa-ade42dfb0e10cbc940f03b98274a128c9d60e4f8.tar.gz mesa-ade42dfb0e10cbc940f03b98274a128c9d60e4f8.tar.bz2 mesa-ade42dfb0e10cbc940f03b98274a128c9d60e4f8.zip | |
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 <mary.guillemard@collabora.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26303>
(cherry picked from commit db0f177edd793f30edee44c101bfdc7f9ea6e788)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_resource.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 52e918ac440..c0eaca59bf3 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 40a1b15ec04..121663a72ef 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) && |