From 8f7563444c4746b853435a52823334287b607cb9 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Tue, 2 Sep 2025 22:39:35 +0000 Subject: [PATCH] nvk: bind aliased wsi image at memory offset zero This aligns with common wsi, and also obeys dedicated alloc requirement. Fixes: 273df23a219 ("nvk: adopt wsi_common_get_memory") Reviewed-by: Faith Ekstrand Part-of: (cherry picked from commit 611749a7f93dfba0802b49f2b14e455daec35781) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_image.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a9343ee48c3..ecf3e485739 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9924,7 +9924,7 @@ "description": "nvk: bind aliased wsi image at memory offset zero", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "273df23a21947949b78960a573db09a33dd6be54", "notes": null diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 73bc9594c44..b1eadeaa300 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -1509,6 +1509,7 @@ nvk_bind_image_memory(struct nvk_device *dev, { VK_FROM_HANDLE(nvk_device_memory, mem, info->memory); VK_FROM_HANDLE(nvk_image, image, info->image); + uint64_t offset_B = info->memoryOffset; VkResult result; #if DETECT_OS_ANDROID @@ -1529,11 +1530,11 @@ nvk_bind_image_memory(struct nvk_device *dev, assert(swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE); mem = nvk_device_memory_from_handle( wsi_common_get_memory(swapchain_info->swapchain, swapchain_info->imageIndex)); + offset_B = 0; } #endif assert(mem != NULL); - uint64_t offset_B = info->memoryOffset; if (image->disjoint) { const VkBindImagePlaneMemoryInfo *plane_info = vk_find_struct_const(info->pNext, BIND_IMAGE_PLANE_MEMORY_INFO);