From 1bbb99d6490a6e9a4b5c480328419c9904592c82 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 25 Apr 2018 11:38:36 +0100
Subject: [PATCH] Add support for VK_EXT_global_priority just ignoring for now

* In future we could serialise (but perhaps not apply?) the global
  priority pNext struct
---
 renderdoc/driver/vulkan/vk_core.cpp       | 3 +++
 renderdoc/driver/vulkan/vk_hookset_defs.h | 3 ++-
 renderdoc/driver/vulkan/vk_serialise.cpp  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index e796df063..aab11ad0a 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -554,6 +554,9 @@ static const VkExtensionProperties supportedExtensions[] = {
     {
         VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME, VK_EXT_DISPLAY_SURFACE_COUNTER_SPEC_VERSION,
     },
+    {
+        VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME, VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION,
+    },
     // this extension is 'free' - it just marks SPIR-V extension availability
     {
         VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME, VK_EXT_SHADER_SUBGROUP_BALLOT_SPEC_VERSION,
diff --git a/renderdoc/driver/vulkan/vk_hookset_defs.h b/renderdoc/driver/vulkan/vk_hookset_defs.h
index 6c8e7a340..1e535be5b 100644
--- a/renderdoc/driver/vulkan/vk_hookset_defs.h
+++ b/renderdoc/driver/vulkan/vk_hookset_defs.h
@@ -322,7 +322,8 @@
   CheckExt(KHR_push_descriptor, VKXX);            \
   CheckExt(KHR_descriptor_update_template, VK11); \
   CheckExt(KHR_bind_memory2, VK11);               \
-  CheckExt(EXT_conservative_rasterization, VKXX);
+  CheckExt(EXT_conservative_rasterization, VKXX); \
+  CheckExt(EXT_global_priority, VKXX);
 
 #define HookInitVulkanInstanceExts()                                                                 \
   HookInitExtension(KHR_surface, DestroySurfaceKHR);                                                 \
diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp
index 1cfd555f8..bb210d1ce 100644
--- a/renderdoc/driver/vulkan/vk_serialise.cpp
+++ b/renderdoc/driver/vulkan/vk_serialise.cpp
@@ -166,6 +166,9 @@ SERIALISE_VK_HANDLES();
   /* VK_KHR_dedicated_allocation */                                                               \
   PNEXT_IGNORE(VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR)                              \
                                                                                                   \
+  /* VK_EXT_global_priority */                                                                    \
+  PNEXT_IGNORE(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT)                    \
+                                                                                                  \
   /* VK_EXT_conservative_rasterization */                                                         \
   PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT,       \
                VkPipelineRasterizationConservativeStateCreateInfoEXT)                             \