AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: adopt wsi_common_get_memory

Browse Source 
Tested-by: Thomas H.P. Andersen <phomes@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35875>
This commit is contained in:
Yiwei Zhang
2025-07-01 20:40:11 -07:00
committed by Marge Bot
parent 187956bd51
commit 273df23a21
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_image.c
+7 -18
View File
@@ -1523,27 +1523,16 @@ nvk_bind_image_memory(struct nvk_device *dev,
/* Ignore this struct on Android, we cannot access swapchain structures there. */ /* Ignore this struct on Android, we cannot access swapchain structures there. */
#ifdef NVK_USE_WSI_PLATFORM #ifdef NVK_USE_WSI_PLATFORM
const VkBindImageMemorySwapchainInfoKHR *swapchain_info = if (mem == NULL) {
vk_find_struct_const(info->pNext, BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR); const VkBindImageMemorySwapchainInfoKHR *swapchain_info =
vk_find_struct_const(info->pNext, BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR);
if (swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE) { assert(swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE);
VkImage _wsi_image = wsi_common_get_image(swapchain_info->swapchain, mem = nvk_device_memory_from_handle(
swapchain_info->imageIndex); wsi_common_get_memory(swapchain_info->swapchain, swapchain_info->imageIndex));
VK_FROM_HANDLE(nvk_image, wsi_img, _wsi_image);
assert(image->plane_count == 1);
assert(wsi_img->plane_count == 1);
struct nvk_image_plane *plane = &image->planes[0];
struct nvk_image_plane *swapchain_plane = &wsi_img->planes[0];
/* Copy memory binding information from swapchain image to the current image's plane. */
plane->addr = swapchain_plane->addr;
return VK_SUCCESS;
} }
#endif #endif
assert(mem != NULL);
uint64_t offset_B = info->memoryOffset; uint64_t offset_B = info->memoryOffset;
if (image->disjoint) { if (image->disjoint) {
const VkBindImagePlaneMemoryInfo *plane_info = const VkBindImagePlaneMemoryInfo *plane_info =