From 6af18a56228c8c5c75ef9a3bdbd766840fbf74dd Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 5 Aug 2020 13:22:13 +0100
Subject: [PATCH] Patch another form of handle string in vulkan debug messages

---
 renderdoc/driver/vulkan/vk_core.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index af6814bf4..4ea4ab88c 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -3433,6 +3433,8 @@ void WrappedVulkan::ProcessDebugMessage(DebugMessage &msg)
             }
           }
 
+          bool do_replace = false;
+
           // we now expect a [NAME]. Look for matched set of []s
           if(desc[end] == '[')
           {
@@ -3449,6 +3451,16 @@ void WrappedVulkan::ProcessDebugMessage(DebugMessage &msg)
               end++;
             }
 
+            do_replace = true;
+          }
+          // if we didn't see a trailing [], look for a preceeding handle =
+          else if(offs >= 9 && desc.substr(offs - 9, 9) == "handle = ")
+          {
+            do_replace = true;
+          }
+
+          if(do_replace)
+          {
             // unique objects layer implies this is a unique search so we don't have to worry
             // about type aliases
             ResourceId id = GetResourceManager()->GetFirstIDForHandle(val);