commit b95f07bfab0aaf4a5217d88cce03b51bc29c7268
author Yilong Li <liyl@google.com> Tue Jan 04 02:36:00 2022 -0800
committer Yilong Li <liyl@google.com> Wed Jan 05 23:00:04 2022 -0800
tree 4ea4683e1f380d70af7f71b40a59d63ab8629fb5
parent faad36400a7fa9a0f822b1b9613e416ce862ec3c

Reland vulkan-198[G2]: Update guest handle list.

This updates the guest handle list to cover new non-dispatchable
handles in VK_NVX_binary_import extension.

Bug: 187216205
Change-Id: Ic3c8ad14f21723aaf248134b4f6cfe0ffa7a7326

system/vulkan_enc/VulkanHandles.h

diff --git a/system/vulkan_enc/VulkanHandles.h b/system/vulkan_enc/VulkanHandles.h
index b3b7e51..4038bad 100644
--- a/system/vulkan_enc/VulkanHandles.h
+++ b/system/vulkan_enc/VulkanHandles.h
@@ -26,6 +26,18 @@
     f(VkQueue) \
     GOLDFISH_VK_LIST_TRIVIAL_DISPATCHABLE_HANDLE_TYPES(f)
 
+#ifdef VK_NVX_binary_import
+
+#define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_BINARY_IMPORT(f) \
+    f(VkCuModuleNVX) \
+    f(VkCuFunctionNVX) \
+
+#else
+
+#define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_BINARY_IMPORT(f)
+
+#endif // VK_NVX_binary_import
+
 #ifdef VK_NVX_device_generated_commands
 
 #define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_DEVICE_GENERATED_COMMANDS(f) \
@@ -101,6 +113,7 @@
     f(VkValidationCacheEXT) \
     f(VkDebugReportCallbackEXT) \
     f(VkDebugUtilsMessengerEXT) \
+    __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_BINARY_IMPORT(f) \
     __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_DEVICE_GENERATED_COMMANDS(f) \
     __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NV_DEVICE_GENERATED_COMMANDS(f) \
     __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NV_RAY_TRACING(f) \