diff --git a/src/xrt/auxiliary/vk/vk_bundle_init.c b/src/xrt/auxiliary/vk/vk_bundle_init.c index e12fc7891..e941bcf3e 100644 --- a/src/xrt/auxiliary/vk/vk_bundle_init.c +++ b/src/xrt/auxiliary/vk/vk_bundle_init.c @@ -1238,6 +1238,9 @@ vk_create_device(struct vk_bundle *vk, } vk->vkGetDeviceQueue(vk->device, vk->queue_family_index, 0, &vk->queue); + // Need to do this after functions have been gotten. + VK_NAME_OBJECT(vk, DEVICE, vk->device, "vk_bundle device"); + return ret; err_destroy: diff --git a/src/xrt/auxiliary/vk/vk_image_allocator.c b/src/xrt/auxiliary/vk/vk_image_allocator.c index ff65ee820..67a38d2f4 100644 --- a/src/xrt/auxiliary/vk/vk_image_allocator.c +++ b/src/xrt/auxiliary/vk/vk_image_allocator.c @@ -307,6 +307,9 @@ vk_ic_allocate(struct vk_bundle *vk, if (ret != VK_SUCCESS) { break; } + + VK_NAME_OBJECT(vk, IMAGE, out_vkic->images[i].handle, "vk_image_collection image"); + VK_NAME_OBJECT(vk, DEVICE_MEMORY, out_vkic->images[i].memory, "vk_image_collection device_memory"); } // Set the fields. @@ -371,6 +374,10 @@ vk_ic_from_natives(struct vk_bundle *vk, } break; } + + VK_NAME_OBJECT(vk, IMAGE, out_vkic->images[i].handle, "vk_image_collection image"); + VK_NAME_OBJECT(vk, DEVICE_MEMORY, out_vkic->images[i].memory, "vk_image_collection device_memory"); + native_images[i].handle = buf; } // Set the fields. diff --git a/src/xrt/auxiliary/vk/vk_image_readback_to_xf_pool.c b/src/xrt/auxiliary/vk/vk_image_readback_to_xf_pool.c index 2bbd88776..3ed5365e8 100644 --- a/src/xrt/auxiliary/vk/vk_image_readback_to_xf_pool.c +++ b/src/xrt/auxiliary/vk/vk_image_readback_to_xf_pool.c @@ -69,6 +69,9 @@ vk_xf_readback_pool_try_create_new_frame(struct vk_bundle *vk, struct vk_image_r &memory, // &image); // + VK_NAME_OBJECT(vk, DEVICE_MEMORY, memory, "vk_image_readback_to_xf_pool device memory"); + VK_NAME_OBJECT(vk, IMAGE, image, "vk_image_readback_to_xf_pool image"); + (void)res; // Get layout of the image (including row pitch) diff --git a/src/xrt/auxiliary/vk/vk_sync_objects.c b/src/xrt/auxiliary/vk/vk_sync_objects.c index 3f375cf22..d671019b8 100644 --- a/src/xrt/auxiliary/vk/vk_sync_objects.c +++ b/src/xrt/auxiliary/vk/vk_sync_objects.c @@ -241,7 +241,6 @@ create_semaphore_and_native(struct vk_bundle *vk, return ret; } - #if defined(XRT_GRAPHICS_SYNC_HANDLE_IS_FD) VkSemaphoreGetFdInfoKHR get_fd_info = { .sType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR,