wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Delay destroying framebuffers until the command list is destroyed.

Browse Source 
Like render passes, these should only be destroyed after all submitted
commands referring to them have completed execution.
This commit is contained in:
Henri Verbeet 2016-10-05 15:29:12 +02:00
parent fb6071d108
commit b7d594349f
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/vkd3d/command.c
View File

@ -667,6 +667,17 @@ static bool d3d12_command_list_add_render_pass(struct d3d12_command_list *list,
return true; return true;
} }
static bool d3d12_command_list_add_framebuffer(struct d3d12_command_list *list, VkFramebuffer framebuffer)
{
if (!vkd3d_array_reserve((void **)&list->framebuffers, &list->framebuffers_size,
list->framebuffer_count + 1, sizeof(*list->framebuffers)))
return false;
list->framebuffers[list->framebuffer_count++] = framebuffer;
return true;
}
static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList *iface, static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList *iface,
REFIID riid, void **object) REFIID riid, void **object)
{ {
@ -718,6 +729,11 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL
if (list->allocator) if (list->allocator)
vkd3d_command_allocator_free_command_list(list->allocator, list); vkd3d_command_allocator_free_command_list(list->allocator, list);
for (i = 0; i < list->framebuffer_count; ++i)
{
VK_CALL(vkDestroyFramebuffer(device->vk_device, list->framebuffers[i], NULL));
}
for (i = 0; i < list->pass_count; ++i) for (i = 0; i < list->pass_count; ++i)
{ {
VK_CALL(vkDestroyRenderPass(device->vk_device, list->passes[i], NULL)); VK_CALL(vkDestroyRenderPass(device->vk_device, list->passes[i], NULL));
@ -1253,6 +1269,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra
return; return;
} }
if (!d3d12_command_list_add_framebuffer(list, vk_framebuffer))
{
WARN("Failed to add framebuffer.\n");
VK_CALL(vkDestroyFramebuffer(list->device->vk_device, vk_framebuffer, NULL));
return;
}
begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
begin_desc.pNext = NULL; begin_desc.pNext = NULL;
begin_desc.renderPass = vk_render_pass; begin_desc.renderPass = vk_render_pass;
@ -1269,8 +1292,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra
VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE)); VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE));
VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer));
} }
VK_CALL(vkDestroyFramebuffer(list->device->vk_device, vk_framebuffer, NULL));
} }
static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface,
@ -1441,6 +1462,10 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d
list->passes_size = 0; list->passes_size = 0;
list->pass_count = 0; list->pass_count = 0;
list->framebuffers = NULL;
list->framebuffers_size = 0;
list->framebuffer_count = 0;
if (initial_pipeline_state) if (initial_pipeline_state)
FIXME("Ignoring initial pipeline state %p.\n", initial_pipeline_state); FIXME("Ignoring initial pipeline state %p.\n", initial_pipeline_state);

4
libs/vkd3d/vkd3d_private.h
View File

@ -210,6 +210,10 @@ struct d3d12_command_list
size_t passes_size; size_t passes_size;
size_t pass_count; size_t pass_count;
VkFramebuffer *framebuffers;
size_t framebuffers_size;
size_t framebuffer_count;
struct d3d12_command_allocator *allocator; struct d3d12_command_allocator *allocator;
struct d3d12_device *device; struct d3d12_device *device;
}; };