diff options
author | Yilong Li <liyl@google.com> | 2020-05-27 04:23:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 04:23:24 +0000 |
commit | fd04949343bbcb45352763676bc70e92d8eba062 (patch) | |
tree | a05c32fa95246d9b0918620c10863d0e8ee1992b | |
parent | bdc475a8e11fb53ff1f37ebba8969cfc4cf53e34 (diff) | |
parent | f1520aed06365065cfdbba249f06edf56f816184 (diff) | |
download | goldfish-opengl-fd04949343bbcb45352763676bc70e92d8eba062.tar.gz |
Define NVX_device_generated_commands handles only when that extension exists. am: f1520aed06
Change-Id: I8ce17f34690d9bedb7eb149d1f74f1f4ea5b0a83
-rw-r--r-- | system/vulkan_enc/VulkanHandles.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/system/vulkan_enc/VulkanHandles.h b/system/vulkan_enc/VulkanHandles.h index 376f2fc9..54699aa1 100644 --- a/system/vulkan_enc/VulkanHandles.h +++ b/system/vulkan_enc/VulkanHandles.h @@ -26,6 +26,18 @@ f(VkCommandBuffer) \ GOLDFISH_VK_LIST_TRIVIAL_DISPATCHABLE_HANDLE_TYPES(f) +#ifdef VK_NVX_device_generated_commands + +#define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_DEVICE_GENERATED_COMMANDS(f) \ + f(VkObjectTableNVX) \ + f(VkIndirectCommandsLayoutNVX) \ + +#else + +#define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_DEVICE_GENERATED_COMMANDS(f) + +#endif // VK_NVX_device_generated_commands + #define GOLDFISH_VK_LIST_TRIVIAL_NON_DISPATCHABLE_HANDLE_TYPES(f) \ f(VkBufferView) \ f(VkImageView) \ @@ -44,11 +56,10 @@ f(VkSwapchainKHR) \ f(VkDisplayKHR) \ f(VkDisplayModeKHR) \ - f(VkObjectTableNVX) \ - f(VkIndirectCommandsLayoutNVX) \ f(VkValidationCacheEXT) \ f(VkDebugReportCallbackEXT) \ f(VkDebugUtilsMessengerEXT) \ + __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_DEVICE_GENERATED_COMMANDS(f) #define GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES(f) \ f(VkDeviceMemory) \ |