summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Courtney Goeltzenleuchter <courtneygo@google.com> 2017-10-02 22:30:48 +0000
committer android-build-merger <android-build-merger@google.com> 2017-10-02 22:30:48 +0000
commit5819e848ad1b786d253e337291469cf5ed068b43 (patch)
tree65c32bed755bbeaccdd8826f75fe72d80bfc5054
parent0a9f7d05c612fc588ac215e85f7923ecfbef0db5 (diff)
parent8c8e81c229398564050b9082b388ac5ab72c22b4 (diff)
Merge "Limit Display-P3 surface formats to 8888" into oc-mr1-dev am: 8c6462c8c4
am: 8c8e81c229 Change-Id: Ie94c829a3a4bf0dce6b3d5781eeed6341e51b114
-rw-r--r--vulkan/libvulkan/swapchain.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index a346c0ac76..665a32b90c 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -640,11 +640,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,
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 =