commit 8c6462c8c48022a4a77ab8ed218551880d2bbab9
author Courtney Goeltzenleuchter <courtneygo@google.com> Mon Oct 02 21:31:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 02 21:31:43 2017 +0000
tree 682caa147bd96104161cfa39ba289cb3bc570e64
parent c026c52ee67c7019a8018e2a5ec05d32b208ed94
parent bd7e03a6fa4b4843e924d6477cb7ef75d989ad5e

Merge "Limit Display-P3 surface formats to 8888" into oc-mr1-dev

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index a346c0a..665a32b 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -640,11 +640,9 @@
         instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
 
     const VkSurfaceFormatKHR kWideColorFormats[] = {
-        {VK_FORMAT_R16G16B16A16_SFLOAT,
-         VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT},
-        {VK_FORMAT_R16G16B16A16_SFLOAT,
-         VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT},
-        {VK_FORMAT_A2R10G10B10_UNORM_PACK32,
+        {VK_FORMAT_R8G8B8A8_UNORM,
+         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
+        {VK_FORMAT_R8G8B8A8_SRGB,
          VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
     };
     const uint32_t kNumWideColorFormats =