From f46998db244e93aaeee60e3eb41f743246155714 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Thu, 18 Feb 2021 01:11:43 +0000 Subject: [PATCH] vkd3d: Fix SetName for inline query types Signed-off-by: Joshua Ashton --- libs/vkd3d/resource.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c1cb9ac6..f7eb65c1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -6474,8 +6474,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface TRACE("iface %p, name %s.\n", iface, debugstr_w(name)); - return vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_query_pool, - VK_OBJECT_TYPE_QUERY_POOL, name); + if (heap->vk_query_pool) + { + return vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_query_pool, + VK_OBJECT_TYPE_QUERY_POOL, name); + } + else /*if (heap->vk_buffer)*/ + { + return vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_buffer, + VK_OBJECT_TYPE_BUFFER, name); + } } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetDevice(ID3D12QueryHeap *iface, REFIID iid, void **device)