From f8d492ccc317515700636e29902fd9eb80b0e6a3 Mon Sep 17 00:00:00 2001 From: juntak0916 Date: Mon, 23 Mar 2026 12:06:01 -0500 Subject: [PATCH] nvk: fix BindImageMemory2 per-bind status result The per-bind status was always being set to VK_SUCCESS instead of the actual result from nvk_bind_image_memory. Fixes: 93792b5ef2a ("nvk: Add static wrappers for image/buffer binding") Reviewed-by: Mel Henning (cherry picked from commit dd3e153a103fe26df39874a1934b612788c78fad) Part-of: --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index dcabebcd06d..842dd113b65 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2724,7 +2724,7 @@ "description": "nvk: fix BindImageMemory2 per-bind status result", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "93792b5ef2ae0919298409b87a54a16fb38ffafb", "notes": null diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 3cf2ae6d690..e469739a42d 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -1650,7 +1650,7 @@ nvk_BindImageMemory2(VkDevice device, const VkBindMemoryStatusKHR *status = vk_find_struct_const(pBindInfos[i].pNext, BIND_MEMORY_STATUS_KHR); if (status != NULL && status->pResult != NULL) - *status->pResult = VK_SUCCESS; + *status->pResult = result; if (first_error_or_success == VK_SUCCESS) first_error_or_success = result;