Revert "Vulkan: Enable VK_KHR_get_memory_requirements2 extension"

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1090,12 +1090,6 @@ angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueF
     // Initialize features and workarounds.
     initFeatures(displayVk, deviceExtensionNames);
 
-    // Enable VK_KHR_get_memory_requirements2, if supported
-    if (ExtensionFound(VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, deviceExtensionNames))
-    {
-        enabledDeviceExtensions.push_back(VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME);
-    }
-
     // Selectively enable KHR_MAINTENANCE1 to support viewport flipping.
     if ((getFeatures().flipViewportY.enabled) &&
         (mPhysicalDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0)))

src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp

@@ -37,6 +37,17 @@ VkResult InitAllocator(VkPhysicalDevice physicalDevice,
     funcs.vkCreateImage                       = vkCreateImage;
     funcs.vkDestroyImage                      = vkDestroyImage;
     funcs.vkCmdCopyBuffer                     = vkCmdCopyBuffer;
+    {
+#if !defined(ANGLE_SHARED_LIBVULKAN)
+        // When the vulkan-loader is statically linked, we need to use the extension
+        // functions defined in ANGLE's rx namespace. When it's dynamically linked
+        // with volk, this will default to the function definitions with no namespace
+        using rx::vkGetBufferMemoryRequirements2KHR;
+        using rx::vkGetImageMemoryRequirements2KHR;
+#endif  // !defined(ANGLE_SHARED_LIBVULKAN)
+        funcs.vkGetBufferMemoryRequirements2KHR = vkGetBufferMemoryRequirements2KHR;
+        funcs.vkGetImageMemoryRequirements2KHR  = vkGetImageMemoryRequirements2KHR;
+    }
 
     VmaAllocatorCreateInfo allocatorInfo = {};
     allocatorInfo.physicalDevice         = physicalDevice;