diff options
| author | Yilong Li <liyl@google.com> | 2020-05-20 19:30:32 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2020-05-26 12:42:41 -0700 |
| commit | f1520aed06365065cfdbba249f06edf56f816184 (patch) | |
| tree | a05c32fa95246d9b0918620c10863d0e8ee1992b | |
| parent | 31855e4e562abdc6945c42ec595845b5b2885c70 (diff) | |
| download | device_generic_goldfish-opengl-f1520aed06365065cfdbba249f06edf56f816184.tar.gz device_generic_goldfish-opengl-f1520aed06365065cfdbba249f06edf56f816184.tar.bz2 device_generic_goldfish-opengl-f1520aed06365065cfdbba249f06edf56f816184.zip | |
Define NVX_device_generated_commands handles only when that extension exists.
After Vulkan SDK 1.2.135 (currently used in Fuchsia tree),
VK_NVX_device_generated_commands is renamed to VK_NV_... .
This change modifies the handle definition to make sure that
we only refer to these handle types when the NVX extension exists.
Bug: 154346346
Test: presubmit
Merged-In: Ib1063f7d5e3b6efefee2bc643e4cef58fbd8a39f
Change-Id: Ie68935bd06930abcb673ea3b869c5a0ced1bc010
| -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) \ |