From 38fa7a1ac791650cca288e2cb7718569b43c6030 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 9 Feb 2022 18:54:21 +0000
Subject: [PATCH] Fix compile error

---
 renderdoc/core/core.cpp                            | 5 +++++
 renderdoc/driver/shaders/dxbc/dxbc_container.cpp   | 4 ++--
 renderdoc/driver/vulkan/vk_overlay.cpp             | 2 +-
 renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp
index 343e4633a..e553fdcf5 100644
--- a/renderdoc/core/core.cpp
+++ b/renderdoc/core/core.cpp
@@ -49,6 +49,11 @@
 RDOC_DEBUG_CONFIG(bool, Capture_Debug_SnapshotDiagnosticLog, false,
                   "Snapshot the diagnostic log at capture time and embed in the capture.");
 
+// this is declared centrally so it can be shared with any backend - the name is a misnomer but kept
+// for backwards compatibility reasons.
+RDOC_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths, {},
+            "Paths to search for separated shader debug PDBs.");
+
 void LogReplayOptions(const ReplayOptions &opts)
 {
   RDCLOG("%s API validation during replay", (opts.apiValidation ? "Enabling" : "Not enabling"));
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
index ede1fdeb7..de4c77a96 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
@@ -37,8 +37,8 @@
 
 #include "driver/dx/official/d3dcompiler.h"
 
-RDOC_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths, {},
-            "Paths to search for separated shader debug PDBs.");
+// this is extern so that it can be shared with vulkan
+RDOC_EXTERN_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths);
 
 namespace DXBC
 {
diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp
index 1c2b681c2..26bf222f0 100644
--- a/renderdoc/driver/vulkan/vk_overlay.cpp
+++ b/renderdoc/driver/vulkan/vk_overlay.cpp
@@ -267,7 +267,7 @@ struct VulkanQuadOverdrawCallback : public VulkanActionCallback
     // don't care
   }
   bool SplitSecondary() { return false; }
-  bool ForceLoadRPs() override { return false; }
+  bool ForceLoadRPs() { return false; }
   void PreCmdExecute(uint32_t baseEid, uint32_t secondaryFirst, uint32_t secondaryLast,
                      VkCommandBuffer cmd)
   {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index b56338bfd..8ac686de5 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -2220,7 +2220,8 @@ bool WrappedVulkan::Serialise_vkDebugMarkerSetObjectNameEXT(
           break;
       }
 
-      if(ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT && type != VK_OBJECT_TYPE_UNKNOWN)
+      if(ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT &&
+         type != VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT)
       {
         name.objectType = type;
         ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT(Unwrap(m_Device), &name);