Vulkan: Switch to EXT_debug_utils

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -243,6 +243,7 @@ class RendererVk : angle::NonCopyable
     VkInstance mInstance;
     bool mEnableValidationLayers;
     bool mEnableMockICD;
+    VkDebugUtilsMessengerEXT mDebugUtilsMessenger;
     VkDebugReportCallbackEXT mDebugReportCallback;
     VkPhysicalDevice mPhysicalDevice;
     VkPhysicalDeviceProperties mPhysicalDeviceProperties;

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -1285,6 +1285,35 @@ void GarbageObject::destroy(VkDevice device)
 }
 }  // namespace vk
 
+// VK_EXT_debug_utils
+PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT   = nullptr;
+PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = nullptr;
+
+// VK_EXT_debug_report
+PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT   = nullptr;
+PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = nullptr;
+
+#define GET_FUNC(vkName)                                                                   \
+    do                                                                                     \
+    {                                                                                      \
+        vkName = reinterpret_cast<PFN_##vkName>(vkGetInstanceProcAddr(instance, #vkName)); \
+        ASSERT(vkName);                                                                    \
+    } while (0)
+
+void InitDebugUtilsEXTFunctions(VkInstance instance)
+{
+    GET_FUNC(vkCreateDebugUtilsMessengerEXT);
+    GET_FUNC(vkDestroyDebugUtilsMessengerEXT);
+}
+
+void InitDebugReportEXTFunctions(VkInstance instance)
+{
+    GET_FUNC(vkCreateDebugReportCallbackEXT);
+    GET_FUNC(vkDestroyDebugReportCallbackEXT);
+}
+
+#undef GET_FUNC
+
 namespace gl_vk
 {
 

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -858,6 +858,19 @@ class BindingPointer final : angle::NonCopyable
 };
 }  // namespace vk
 
+// List of function pointers for used extensions.
+// VK_EXT_debug_utils
+extern PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
+extern PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
+
+// VK_EXT_debug_report
+extern PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
+extern PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
+
+// Lazily load entry points for each extension as necessary.
+void InitDebugUtilsEXTFunctions(VkInstance instance);
+void InitDebugReportEXTFunctions(VkInstance instance);
+
 namespace gl_vk
 {
 VkRect2D GetRect(const gl::Rectangle &source);