commit cd180b0af295fa7742622ca01eddc1f2a4aa546e
author Greg Schlomoff <gregschlom@google.com> Thu May 12 16:50:56 2022 -0700
committer Greg Schlomoff <gregschlom@google.com> Fri May 13 16:11:46 2022 -0700
tree af523c342bdd008d97d663eb016590bf1b0712b0
parent 0492abedaad9169f3e1a91bf89cf6bf6685edb54

Fix a gfxstream crash when RenderDoc is used on Vulkan-on-Vulkan apps.

Also, replace a bunch of raw extension names with constants.

Change-Id: I941deb54f2bc89f36ff4c76eb07a2a60ef44b226

stream-servers/vulkan/VkCommonOperations.cpp

diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp
index e2d61d8..af413f4 100644
--- a/stream-servers/vulkan/VkCommonOperations.cpp
+++ b/stream-servers/vulkan/VkCommonOperations.cpp
@@ -501,18 +501,18 @@
     auto gvk = vk;
 
     std::vector<const char*> externalMemoryInstanceExtNames = {
-        "VK_KHR_external_memory_capabilities",
-        "VK_KHR_get_physical_device_properties2",
+        VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
+        VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
     };
 
     std::vector<const char*> externalMemoryDeviceExtNames = {
-        "VK_KHR_dedicated_allocation",
-        "VK_KHR_get_memory_requirements2",
-        "VK_KHR_external_memory",
+        VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME,
+        VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME,
+        VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME,
 #ifdef _WIN32
-        "VK_KHR_external_memory_win32",
+        VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME,
 #else
-        "VK_KHR_external_memory_fd",
+        VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,
 #endif
     };