commit f9a9b903a95b7630d57375667a1f3e6ccfa21f0a
author Neha Jain <jainne@google.com> Wed Jul 20 02:24:57 2022 +0000
committer Neha Jain <jainne@google.com> Wed Jul 20 02:24:57 2022 +0000
tree 52176b5d5c21751ab5a84145a6a699aa5a628b50
parent c42eae5297150eaa3606eea472ceb568c48b0a43

Revert "Allow use of PASS_THROUGH colorspace with RGBA8"

Revert "Use PASS_THROUGH on EGL_NONE colorspaces"

Revert submission 19154196-angle-colorspace-quickfix

Reason for revert: b/238720540
Reverted Changes:
I82743e539:Use PASS_THROUGH on EGL_NONE colorspaces
I7aebe80d7:Allow use of PASS_THROUGH colorspace with RGBA8

Change-Id: If1eb097b62bb33b2bc4585e2d207acdaae9bc700

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index eb669c0..f866005 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -763,11 +763,7 @@
     // 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},
-        // 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},
-    };
+        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR}};
 
     if (colorspace_ext) {
         all_formats.emplace_back(VkSurfaceFormatKHR{