The open source OpenXR runtime
a/vk: Disable naming of VkDescriptorSet objects
Mesa RADV leaks the names on descriptor pools we use reset on.
+3
-1
+3
-1
src/xrt/auxiliary/vk/vk_helpers.h
+3
-1
src/xrt/auxiliary/vk/vk_helpers.h
···
655
655
* it causes memory corruption, asserts, crashes or functions failing. This
656
656
* is as of writing broken on the 23.2.1 release, fixed in main and scheduled
657
657
* for the 23.2.2 release.
658
+
* 3. Mesa RADV leaks the name strings for VkDescriptorSet objects for pools
659
+
* that we use the reset function.
658
660
*
659
661
* @ingroup aux_vk
660
662
*/
···
687
689
#define VK_NAME_DESCRIPTOR_SET_LAYOUT(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkDescriptorSetLayout, DESCRIPTOR_SET_LAYOUT, OBJ, NAME)
688
690
#define VK_NAME_SAMPLER(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkSampler, SAMPLER, OBJ, NAME)
689
691
#define VK_NAME_DESCRIPTOR_POOL(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkDescriptorPool, DESCRIPTOR_POOL, OBJ, NAME)
690
-
#define VK_NAME_DESCRIPTOR_SET(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkDescriptorSet, DESCRIPTOR_SET, OBJ, NAME)
692
+
#define VK_NAME_DESCRIPTOR_SET(VK, OBJ, NAME) VK_NAME_OBJ_DISABLED(VK, VkDescriptorSet, OBJ)
691
693
#define VK_NAME_FRAMEBUFFER(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkFramebuffer, FRAMEBUFFER, OBJ, NAME)
692
694
#define VK_NAME_COMMAND_POOL(VK, OBJ, NAME) VK_NAME_OBJ(VK, VkCommandPool, COMMAND_POOL, OBJ, NAME)
693
695