Module: vkd3d Branch: master Commit: 9ebf779ef0f22285fc3c5ba9f1d22b5a84ddbc90 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ebf779ef0f22285fc3c5ba9f1d22b...
Author: Giovanni Mascellani gmascellani@codeweavers.com Date: Tue Jul 9 14:53:02 2024 +0200
vkd3d: Propagate a failure in d3d12_descriptor_heap_init().
---
libs/vkd3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index db2d8742..7d7f40c0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4349,7 +4349,11 @@ static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descript return hr;
descriptor_heap->use_vk_heaps = device->use_vk_heaps && (desc->Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE); - d3d12_descriptor_heap_vk_descriptor_sets_init(descriptor_heap, device, desc); + if (FAILED(hr = d3d12_descriptor_heap_vk_descriptor_sets_init(descriptor_heap, device, desc))) + { + vkd3d_private_store_destroy(&descriptor_heap->private_store); + return hr; + } vkd3d_mutex_init(&descriptor_heap->vk_sets_mutex);
d3d12_device_add_ref(descriptor_heap->device = device);