Revert "vulkan-198[G2]: Update guest handle list."
Revert "vulkan-198[2]: Update Vulkan cereal registry to upstream..."
Revert submission 1936298-vk-198
Reason for revert: build break, see b/213387439
Reverted Changes:
I54806807b:vulkan-198[G1]: Support building on old version of...
I26eff7a39:vulkan-198[G3]: guest codegen
Ib33eab698:vulkan-198[G2]: Update guest handle list.
I9544126f3:vulkan-198[5]: host codegen
I2ad28ff23:vulkan-198[4]: Update host handle list.
Iad30ec94a:vulkan-198[3]: Add 1.2.198 structs for special han...
I6d996641a:vulkan-198[2]: Update Vulkan cereal registry to up...
Change-Id: I08e238869a2595f1c46e01bd8c2790959c2c7fcf
diff --git a/system/vulkan_enc/VulkanHandles.h b/system/vulkan_enc/VulkanHandles.h
index 4038bad..b3b7e51 100644
--- a/system/vulkan_enc/VulkanHandles.h
+++ b/system/vulkan_enc/VulkanHandles.h
@@ -26,18 +26,6 @@
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) \
@@ -113,7 +101,6 @@
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) \
