diff options
| author | 2023-08-04 23:41:19 +0000 | |
|---|---|---|
| committer | 2023-08-04 23:41:19 +0000 | |
| commit | 3cee7572202a9bffcb6d312a9f741092ba840d44 (patch) | |
| tree | d60fab66e6c4263b774d2993fdbe3d515c74fb81 /vulkan/libvulkan/driver.cpp | |
| parent | 5742551b900fce5eb6c505661d6481223a9fda3c (diff) | |
| parent | 92edf5398b5a7d40b1cf126d6edaed59f742e056 (diff) | |
Merge "Add swapchainImageUsage to VkGrallocUsageInfo2" into udc-qpr-dev am: 92edf5398b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24314871
Change-Id: I9d2741c1448e31d11a518083bf6033dd963d7d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'vulkan/libvulkan/driver.cpp')
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 273cdd547e..d21deef493 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -1422,13 +1422,15 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice, if ((wrapper.GetHalExtensions()[ProcHook::ANDROID_native_buffer]) && !data->driver.GetSwapchainGrallocUsageANDROID && !data->driver.GetSwapchainGrallocUsage2ANDROID && - !data->driver.GetSwapchainGrallocUsage3ANDROID) { + !data->driver.GetSwapchainGrallocUsage3ANDROID && + !data->driver.GetSwapchainGrallocUsage4ANDROID) { ALOGE( "Driver's implementation of ANDROID_native_buffer is broken;" " must expose at least one of " "vkGetSwapchainGrallocUsageANDROID or " "vkGetSwapchainGrallocUsage2ANDROID or " - "vkGetSwapchainGrallocUsage3ANDROID"); + "vkGetSwapchainGrallocUsage3ANDROID or " + "vkGetSwapchainGrallocUsage4ANDROID"); data->driver.DestroyDevice(dev, pAllocator); FreeDeviceData(data, data_allocator); |