diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 0a9e64d42..e5eb03346 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -165,6 +165,11 @@ void VkMarkerRegion::End(VkQueue q) ObjDisp(q)->QueueEndDebugUtilsLabelEXT(Unwrap(q)); } +template <> +VkObjectType objType() +{ + return VK_OBJECT_TYPE_SAMPLER; +} template <> VkObjectType objType() { diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index ac83cc63e..249722a6d 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -3915,6 +3915,8 @@ void VulkanReplay::GeneralMisc::Init(WrappedVulkan *driver, VkDescriptorPool des CHECK_VKR(driver, vkr); CREATE_OBJECT(PointSampler, VK_FILTER_NEAREST); + + NameVulkanObject(PointSampler, "General PointSampler"); } void VulkanReplay::GeneralMisc::Destroy(WrappedVulkan *driver) @@ -3935,6 +3937,9 @@ void VulkanReplay::TextureRendering::Init(WrappedVulkan *driver, VkDescriptorPoo CREATE_OBJECT(PointSampler, VK_FILTER_NEAREST); CREATE_OBJECT(LinearSampler, VK_FILTER_LINEAR); + NameVulkanObject(PointSampler, "Texture PointSampler"); + NameVulkanObject(LinearSampler, "Texture LinearSampler"); + CREATE_OBJECT(DescSetLayout, { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_ALL, NULL}, @@ -4128,6 +4133,8 @@ void VulkanReplay::TextureRendering::Init(WrappedVulkan *driver, VkDescriptorPoo CREATE_OBJECT(DummySampler, VK_FILTER_NEAREST); + NameVulkanObject(DummySampler, "DummySampler"); + for(size_t fmt = 0; fmt < ARRAY_COUNT(formats); fmt++) { for(size_t type = 0; type < ARRAY_COUNT(types); type++) @@ -4442,6 +4449,8 @@ void VulkanReplay::OverlayRendering::Init(WrappedVulkan *driver, VkDescriptorPoo CREATE_OBJECT(m_PointSampler, VK_FILTER_NEAREST); + NameVulkanObject(m_PointSampler, "Overlay PointSampler"); + CREATE_OBJECT(m_CheckerDescSetLayout, {{0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_ALL, NULL}}); diff --git a/renderdoc/driver/vulkan/vk_rendertext.cpp b/renderdoc/driver/vulkan/vk_rendertext.cpp index 0a949f189..d0ebe383a 100644 --- a/renderdoc/driver/vulkan/vk_rendertext.cpp +++ b/renderdoc/driver/vulkan/vk_rendertext.cpp @@ -66,6 +66,8 @@ VulkanTextRenderer::VulkanTextRenderer(WrappedVulkan *driver) vkr = ObjDisp(dev)->CreateSampler(Unwrap(dev), &sampInfo, NULL, &m_LinearSampler); RDCASSERTEQUAL(vkr, VK_SUCCESS); + NameUnwrappedVulkanObject(m_LinearSampler, "m_LinearSampler"); + // just need enough for text rendering VkDescriptorPoolSize captureDescPoolTypes[] = { {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1},