diff --git a/.pick_status.json b/.pick_status.json index 840c8e0a9e6..13087e0eb98 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1464,7 +1464,7 @@ "description": "vulkan/wsi: Signal buffer memory object when blitting", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index d18ca4d9ebd..120aa063b33 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -1527,7 +1527,8 @@ wsi_common_queue_present(const struct wsi_device *wsi, has_signal_dma_buf = false; mem_signal = (struct wsi_memory_signal_submit_info) { .sType = VK_STRUCTURE_TYPE_WSI_MEMORY_SIGNAL_SUBMIT_INFO_MESA, - .memory = image->memory, + .memory = swapchain->blit.type == WSI_SWAPCHAIN_NO_BLIT ? + image->memory : image->blit.memory, }; __vk_append_struct(&submit_info, &mem_signal); }