| commit | 42594d1257a0b06c9f9c386db246ae5f456528fb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 31 01:51:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 31 01:51:05 2022 +0000 |
| tree | f96a08d7469122127ce5dbc433ed7eee8227e745 | |
| parent | bab1e600e393344ab05e7aee51a6909b543ea203 [diff] | |
| parent | 8b1701f4fa51dfadcaac8e9b62099b1b60d139b6 [diff] |
Merge changes Id6f98191,Id9430ca8,Idde11124 am: 8b1701f4fa Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2046795 Change-Id: I82cac01786e64d59b6b7d73067d56957514e2ea3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 0b9ba05..5e36adf 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp
@@ -805,10 +805,6 @@ } } - // NOTE: Any new formats that are added must be coordinated across different - // Android users. This includes the ANGLE team (a layered implementation of - // OpenGL-ES). - VkResult result = VK_SUCCESS; if (formats) { uint32_t transfer_count = all_formats.size();