wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Introduce vkd3d_vk_descriptor_pool_array_pop().

Browse Source
This commit is contained in:
Conor McCarthy 2024-10-25 12:50:08 +10:00 committed by Henri Verbeet
parent 9d46a1863b
commit 8dc9fe725a
Notes: Henri Verbeet 2024-12-05 21:35:35 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1088
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d/command.c
View File

@ -1283,6 +1283,14 @@ static bool vkd3d_vk_descriptor_pool_array_push(struct vkd3d_vk_descriptor_pool_
return vkd3d_vk_descriptor_pool_array_push_array(array, &vk_pool, 1);
}
static VkDescriptorPool vkd3d_vk_descriptor_pool_array_pop(struct vkd3d_vk_descriptor_pool_array *array)
{
if (!array->count)
return VK_NULL_HANDLE;
return array->pools[--array->count];
}
/* Command buffers */
static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list,
const char *message, ...)
@ -1451,13 +1459,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool(
VkDescriptorPool vk_pool;
VkResult vr;
if (allocator->free_descriptor_pools.count > 0)
{
vk_pool = allocator->free_descriptor_pools.pools[allocator->free_descriptor_pools.count - 1];
allocator->free_descriptor_pools.pools[allocator->free_descriptor_pools.count - 1] = VK_NULL_HANDLE;
--allocator->free_descriptor_pools.count;
}
else
if (!(vk_pool = vkd3d_vk_descriptor_pool_array_pop(&allocator->free_descriptor_pools)))
{
pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
pool_desc.pNext = NULL;