wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Store the command buffer in the allocator upon creation.

Browse Source 
For correct function it cannot be freed until the command allocator
is reset, and d3d12_command_allocator_free_command_buffer() normally
does not free it.
This commit is contained in:
Conor McCarthy
2023-05-02 20:45:01 +10:00
committed by Alexandre Julliard
parent 9187a41733
commit 95bad60281
Notes: Alexandre Julliard 2023-07-24 22:54:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/260
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libs/vkd3d/command.c
View File

@@ -1316,32 +1316,26 @@ static HRESULT d3d12_command_allocator_allocate_command_buffer(struct d3d12_comm
return hr; return hr;
} }
allocator->current_command_list = list;
return S_OK;
}
static void d3d12_command_allocator_free_command_buffer(struct d3d12_command_allocator *allocator,
struct d3d12_command_list *list)
{
struct d3d12_device *device = allocator->device;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
TRACE("allocator %p, list %p.\n", allocator, list);
if (allocator->current_command_list == list)
allocator->current_command_list = NULL;
if (!vkd3d_array_reserve((void **)&allocator->command_buffers, &allocator->command_buffers_size, if (!vkd3d_array_reserve((void **)&allocator->command_buffers, &allocator->command_buffers_size,
allocator->command_buffer_count + 1, sizeof(*allocator->command_buffers))) allocator->command_buffer_count + 1, sizeof(*allocator->command_buffers)))
{ {
WARN("Failed to add command buffer.\n"); WARN("Failed to add command buffer.\n");
VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool, VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool,
1, &list->vk_command_buffer)); 1, &list->vk_command_buffer));
return; return E_OUTOFMEMORY;
} }
allocator->command_buffers[allocator->command_buffer_count++] = list->vk_command_buffer; allocator->command_buffers[allocator->command_buffer_count++] = list->vk_command_buffer;
allocator->current_command_list = list;
return S_OK;
}
static void d3d12_command_allocator_remove_command_list(struct d3d12_command_allocator *allocator,
const struct d3d12_command_list *list)
{
if (allocator->current_command_list == list)
allocator->current_command_list = NULL;
} }
static bool d3d12_command_allocator_add_render_pass(struct d3d12_command_allocator *allocator, VkRenderPass pass) static bool d3d12_command_allocator_add_render_pass(struct d3d12_command_allocator *allocator, VkRenderPass pass)
@@ -2314,7 +2308,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL
/* When command pool is destroyed, all command buffers are implicitly freed. */ /* When command pool is destroyed, all command buffers are implicitly freed. */
if (list->allocator) if (list->allocator)
d3d12_command_allocator_free_command_buffer(list->allocator, list); d3d12_command_allocator_remove_command_list(list->allocator, list);
vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE]); vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE]);
vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS]); vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS]);
@@ -2412,7 +2406,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL
if (list->allocator) if (list->allocator)
{ {
d3d12_command_allocator_free_command_buffer(list->allocator, list); d3d12_command_allocator_remove_command_list(list->allocator, list);
list->allocator = NULL; list->allocator = NULL;
} }