From 407233390bb619046cac3bea1bfc3d18ab375c61 Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Fri, 26 Jan 2018 16:07:48 -0500
Subject: [PATCH] Vulkan: support vktrace and renderdoc

---
 src/backend/vulkan/VulkanBackend.cpp | 15 +++++++++++++++
 src/backend/vulkan/VulkanInfo.cpp    |  8 ++++++++
 src/backend/vulkan/VulkanInfo.h      |  4 ++++
 3 files changed, 27 insertions(+)

diff --git a/src/backend/vulkan/VulkanBackend.cpp b/src/backend/vulkan/VulkanBackend.cpp
index 28b747526d..b51505310c 100644
--- a/src/backend/vulkan/VulkanBackend.cpp
+++ b/src/backend/vulkan/VulkanBackend.cpp
@@ -347,6 +347,21 @@ namespace backend { namespace vulkan {
         std::vector<const char*> layersToRequest;
         std::vector<const char*> extensionsToRequest;
 
+        // vktrace works by instering a layer, so we need to explicitly enable it if it is present.
+        // Also it is good to put it in first position so that it doesn't see Vulkan calls inserted
+        // by other layers.
+        if (mGlobalInfo.vktrace) {
+            layersToRequest.push_back(kLayerNameLunargVKTrace);
+            usedKnobs->vktrace = true;
+        }
+        // RenderDoc installs a layer at the system level for its capture but we don't want to use
+        // it unless we are debugging in RenderDoc so we hide it behind a macro.
+#if defined(NXT_USE_RENDERDOC)
+        if (mGlobalInfo.renderDocCapture) {
+            layersToRequest.push_back(kLayerNameRenderDocCapture);
+            usedKnobs->renderDocCapture = true;
+        }
+#endif
 #if defined(NXT_ENABLE_ASSERTS)
         if (mGlobalInfo.standardValidation) {
             layersToRequest.push_back(kLayerNameLunargStandardValidation);
diff --git a/src/backend/vulkan/VulkanInfo.cpp b/src/backend/vulkan/VulkanInfo.cpp
index e0c1b1f678..99efca1ea6 100644
--- a/src/backend/vulkan/VulkanInfo.cpp
+++ b/src/backend/vulkan/VulkanInfo.cpp
@@ -31,6 +31,8 @@ namespace {
 namespace backend { namespace vulkan {
 
     const char kLayerNameLunargStandardValidation[] = "VK_LAYER_LUNARG_standard_validation";
+    const char kLayerNameLunargVKTrace[] = "VK_LAYER_LUNARG_vktrace";
+    const char kLayerNameRenderDocCapture[] = "VK_LAYER_RENDERDOC_Capture";
 
     const char kExtensionNameExtDebugReport[] = "VK_EXT_debug_report";
     const char kExtensionNameKhrSurface[] = "VK_KHR_surface";
@@ -58,6 +60,12 @@ namespace backend { namespace vulkan {
                 if (IsLayerName(layer, kLayerNameLunargStandardValidation)) {
                     info->standardValidation = true;
                 }
+                if (IsLayerName(layer, kLayerNameLunargVKTrace)) {
+                    info->vktrace = true;
+                }
+                if (IsLayerName(layer, kLayerNameRenderDocCapture)) {
+                    info->renderDocCapture = true;
+                }
             }
         }
 
diff --git a/src/backend/vulkan/VulkanInfo.h b/src/backend/vulkan/VulkanInfo.h
index 97fff48061..2f588e401b 100644
--- a/src/backend/vulkan/VulkanInfo.h
+++ b/src/backend/vulkan/VulkanInfo.h
@@ -24,6 +24,8 @@ namespace backend { namespace vulkan {
     class Device;
 
     extern const char kLayerNameLunargStandardValidation[];
+    extern const char kLayerNameLunargVKTrace[];
+    extern const char kLayerNameRenderDocCapture[];
 
     extern const char kExtensionNameExtDebugReport[];
     extern const char kExtensionNameKhrSurface[];
@@ -33,6 +35,8 @@ namespace backend { namespace vulkan {
     struct VulkanGlobalKnobs {
         // Layers
         bool standardValidation = false;
+        bool vktrace = false;
+        bool renderDocCapture = false;
 
         // Extensions
         bool debugReport = false;