fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

venus: use STACK_ARRAY to simplify BindImageMemory2

Browse source 
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28532>
This commit is contained in:
Yiwei Zhang 2024-03-29 17:01:27 -07:00 • committed by Marge Bot
parent 7f75ebfda7
commit 36f639375b
1 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/virtio/vulkan/vn_image.c
View file

@ -743,23 +743,15 @@ vn_BindImageMemory2(VkDevice device,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindImageMemoryInfo *pBindInfos) const VkBindImageMemoryInfo *pBindInfos)
{ {
struct vn_device *dev = vn_device_from_handle(device); STACK_ARRAY(VkBindImageMemoryInfo, bind_infos, bindInfoCount);
const VkAllocationCallbacks *alloc = &dev->base.base.alloc; typed_memcpy(bind_infos, pBindInfos, bindInfoCount);
VkBindImageMemoryInfo *local_infos = NULL;
for (uint32_t i = 0; i < bindInfoCount; i++) { for (uint32_t i = 0; i < bindInfoCount; i++) {
const VkBindImageMemoryInfo *info = &pBindInfos[i]; VkBindImageMemoryInfo *info = &bind_infos[i];
struct vn_image *img = vn_image_from_handle(info->image); struct vn_image *img = vn_image_from_handle(info->image);
struct vn_device_memory *mem = struct vn_device_memory *mem =
vn_device_memory_from_handle(info->memory); vn_device_memory_from_handle(info->memory);
/* no bind info fixup needed */
if (mem && !mem->base_memory) {
if (img->wsi.is_wsi)
vn_image_bind_wsi_memory(img, mem);
continue;
}
if (!mem) { if (!mem) {
#if DETECT_OS_ANDROID #if DETECT_OS_ANDROID
/* TODO handle VkNativeBufferANDROID when we bump up /* TODO handle VkNativeBufferANDROID when we bump up
@ -778,35 +770,26 @@ vn_BindImageMemory2(VkDevice device,
mem = swapchain_img->wsi.memory; mem = swapchain_img->wsi.memory;
#endif #endif
} }
assert(mem);
if (img->wsi.is_wsi) if (img->wsi.is_wsi)
vn_image_bind_wsi_memory(img, mem); vn_image_bind_wsi_memory(img, mem);
if (!local_infos) {
const size_t size = sizeof(*local_infos) * bindInfoCount;
local_infos = vk_alloc(alloc, size, VN_DEFAULT_ALIGN,
VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
if (!local_infos)
return vn_error(dev->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
memcpy(local_infos, pBindInfos, size);
}
/* If mem is suballocated, mem->base_memory is non-NULL and we must /* If mem is suballocated, mem->base_memory is non-NULL and we must
* patch it in. If VkBindImageMemorySwapchainInfoKHR is given, we've * patch it in. If VkBindImageMemorySwapchainInfoKHR is given, we've
* looked mem up above and also need to patch it in. * looked mem up above and also need to patch it in.
*/ */
local_infos[i].memory = vn_device_memory_to_handle( if (mem->base_memory) {
mem->base_memory ? mem->base_memory : mem); info->memory = vn_device_memory_to_handle(mem->base_memory);
local_infos[i].memoryOffset += mem->base_offset; info->memoryOffset += mem->base_offset;
}
} }
if (local_infos)
pBindInfos = local_infos;
struct vn_device *dev = vn_device_from_handle(device);
vn_async_vkBindImageMemory2(dev->primary_ring, device, bindInfoCount, vn_async_vkBindImageMemory2(dev->primary_ring, device, bindInfoCount,
pBindInfos); bind_infos);
vk_free(alloc, local_infos); STACK_ARRAY_FINISH(bind_infos);
return VK_SUCCESS; return VK_SUCCESS;
} }