From b318fbbd4269e88159209d91d4ce64a660b778b1 Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Sun, 20 Oct 2024 22:10:11 +0100 Subject: [PATCH] gfxstream: Check metal extension for external memory Enable guest side support for external memory on host devices with VK_EXT_external_memory_metal extension. Keeping old moltenvk extension check for backwards compatibility. Reviewed-by: Gurchetan Singh Part-of: --- src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp index 0f181d9a996..bb7f1777a1a 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp @@ -1857,13 +1857,13 @@ VkResult ResourceTracker::on_vkEnumerateDeviceExtensionProperties( bool win32ExtMemAvailable = getHostDeviceExtensionIndex("VK_KHR_external_memory_win32") != -1; bool posixExtMemAvailable = getHostDeviceExtensionIndex("VK_KHR_external_memory_fd") != -1; - //TODO(b/349066492): this should check external_memory_metal extension when it's ready - bool moltenVkExtAvailable = getHostDeviceExtensionIndex("VK_MVK_moltenvk") != -1; + bool metalExtMemAvailable = getHostDeviceExtensionIndex("VK_EXT_external_memory_metal") != -1 || + getHostDeviceExtensionIndex("VK_MVK_moltenvk") != -1; bool qnxExtMemAvailable = getHostDeviceExtensionIndex("VK_QNX_external_memory_screen_buffer") != -1; bool hostHasExternalMemorySupport = - win32ExtMemAvailable || posixExtMemAvailable || moltenVkExtAvailable || qnxExtMemAvailable; + win32ExtMemAvailable || posixExtMemAvailable || metalExtMemAvailable || qnxExtMemAvailable; if (hostHasExternalMemorySupport) { #ifdef VK_USE_PLATFORM_ANDROID_KHR