Merge branch 'fix/pixel-history-crash' of https://github.com/nwpuCfy/renderdoc into fix/pixel-history-crash

nwpuCfy · nwpuCfy · commit f5244c616d6c · 2025-11-27T20:23:38.000+08:00
diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -1572,6 +1572,7 @@ bool WrappedVulkan::Serialise_vkBeginCommandBuffer(SerialiserType &ser, VkComman
 
       if(m_ActionCallback && m_ActionCallback->ForceLoadRPs())
       {
+        unwrappedInheritInfo.subpass = 0;
         if(unwrappedInheritInfo.framebuffer != VK_NULL_HANDLE)
         {
           const VulkanCreationInfo::Framebuffer &fbinfo =

Original file line number	Diff line number	Diff line change
`@@ -1572,6 +1572,7 @@ bool WrappedVulkan::Serialise_vkBeginCommandBuffer(SerialiserType &ser, VkComman`
`1572`	`1572`
`1573`	`1573`	`if(m_ActionCallback && m_ActionCallback->ForceLoadRPs())`
`1574`	`1574`	`{`
	`1575`	`+ unwrappedInheritInfo.subpass = 0;`
`1575`	`1576`	`if(unwrappedInheritInfo.framebuffer != VK_NULL_HANDLE)`
`1576`	`1577`	`{`
`1577`	`1578`	`const VulkanCreationInfo::Framebuffer &fbinfo =`