diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 8c73b444c..e3f07b124 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -232,7 +232,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) m_GenericDescSetLayout = VK_NULL_HANDLE; m_GenericPipeLayout = VK_NULL_HANDLE; m_GenericDescSet = VK_NULL_HANDLE; - m_GenericPipeline = VK_NULL_HANDLE; + m_HighlightBoxPipeline = VK_NULL_HANDLE; m_OverlayImageMem = VK_NULL_HANDLE; m_OverlayImage = VK_NULL_HANDLE; @@ -694,10 +694,10 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) pipeInfo.layout = Unwrap(m_GenericPipeLayout); - vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, &m_GenericPipeline); + vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, &m_HighlightBoxPipeline); RDCASSERT(vkr == VK_SUCCESS); - GetResourceManager()->WrapResource(Unwrap(dev), m_GenericPipeline); + GetResourceManager()->WrapResource(Unwrap(dev), m_HighlightBoxPipeline); vt->DestroyRenderPass(Unwrap(dev), RGBA32RP); vt->DestroyRenderPass(Unwrap(dev), RGBA8RP); @@ -1199,10 +1199,10 @@ VulkanDebugManager::~VulkanDebugManager() GetResourceManager()->ReleaseWrappedResource(m_GenericPipeLayout); } - if(m_GenericPipeline != VK_NULL_HANDLE) + if(m_HighlightBoxPipeline != VK_NULL_HANDLE) { - vt->DestroyPipeline(Unwrap(dev), Unwrap(m_GenericPipeline)); - GetResourceManager()->ReleaseWrappedResource(m_GenericPipeline); + vt->DestroyPipeline(Unwrap(dev), Unwrap(m_HighlightBoxPipeline)); + GetResourceManager()->ReleaseWrappedResource(m_HighlightBoxPipeline); } m_OutlineStripVBO.Destroy(vt, dev); diff --git a/renderdoc/driver/vulkan/vk_debug.h b/renderdoc/driver/vulkan/vk_debug.h index 2b2f6aede..47fb9b4e8 100644 --- a/renderdoc/driver/vulkan/vk_debug.h +++ b/renderdoc/driver/vulkan/vk_debug.h @@ -92,7 +92,7 @@ class VulkanDebugManager VkDescriptorSetLayout m_GenericDescSetLayout; VkPipelineLayout m_GenericPipeLayout; VkDescriptorSet m_GenericDescSet; - VkPipeline m_GenericPipeline; + VkPipeline m_HighlightBoxPipeline; GPUBuffer m_OutlineStripVBO; GPUBuffer m_GenericUBO; diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 959cd9183..602fa1bb6 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -965,7 +965,7 @@ void VulkanReplay::RenderHighlightBox(float w, float h, float scale) }; vt->CmdBeginRenderPass(Unwrap(cmd), &rpbegin, VK_RENDER_PASS_CONTENTS_INLINE); - vt->CmdBindPipeline(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(GetDebugManager()->m_GenericPipeline)); + vt->CmdBindPipeline(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(GetDebugManager()->m_HighlightBoxPipeline)); vt->CmdBindDescriptorSets(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(GetDebugManager()->m_GenericPipeLayout), 0, 1, UnwrapPtr(GetDebugManager()->m_GenericDescSet), 1, &uboOffs); VkViewport viewport = { 0.0f, 0.0f, (float)m_DebugWidth, (float)m_DebugHeight, 0.0f, 1.0f };