commit 263fcc8690f2a8db1f4dc2901424fa85784804b3
author Lingfeng Yang <lfy@google.com> Tue Jul 19 01:47:19 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 19 01:47:19 2022 +0000
tree 5cdd9861eba80d32a87187b53411c0f37344f731
parent c8751a0906aa841899127e3c9782688aa3d07feb
parent 6c02fe366df32ff36d93fb72f0dfbc8b34d6e3ea

Allow use of PASS_THROUGH colorspace with RGBA8 am: e29191c756 am: a122b75961 am: 69b3717bf6 am: 6c02fe366d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2157379

Change-Id: I8daa37129e9b8e21dbdb5a5eaeded4157ea73130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 48d6fd0..fdff33a 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -763,7 +763,11 @@
     // We must support R8G8B8A8
     std::vector<VkSurfaceFormatKHR> all_formats = {
         {VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},
-        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR}};
+        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},
+        // Also allow to use PASS_THROUGH + HAL_DATASPACE_ARBITRARY
+        {VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_PASS_THROUGH_EXT},
+        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_PASS_THROUGH_EXT},
+    };
 
     if (colorspace_ext) {
         all_formats.emplace_back(VkSurfaceFormatKHR{