From ed813e25bb833d7a85e5fe536a6698db04306cf1 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 15 Dec 2020 11:23:23 +0000
Subject: [PATCH] Fix crash in vulkan overlay if non-drawcall is selected

---
 renderdoc/driver/vulkan/vk_overlay.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp
index 1143be6cb..529946acc 100644
--- a/renderdoc/driver/vulkan/vk_overlay.cpp
+++ b/renderdoc/driver/vulkan/vk_overlay.cpp
@@ -507,11 +507,14 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
 
   VkMarkerRegion::Begin(StringFormat::Fmt("RenderOverlay %d", overlay), cmd);
 
-  uint32_t multiviewMask = 0;
+  uint32_t multiviewMask = m_Overlay.MultiViewMask;
+
+  if(m_pDriver->m_RenderState.renderPass != ResourceId())
   {
     const VulkanCreationInfo::RenderPass &rp =
         m_pDriver->m_CreationInfo.m_RenderPass[m_pDriver->m_RenderState.renderPass];
 
+    multiviewMask = 0;
     for(uint32_t v : rp.subpasses[m_pDriver->m_RenderState.subpass].multiviews)
       multiviewMask |= 1U << v;
   }