diff options
author | Courtney Goeltzenleuchter | 2017-09-28 12:34:18 -0500 |
---|---|---|
committer | Courtney Goeltzenleuchter | 2017-09-28 15:14:34 -0500 |
commit | bd7e03a6fa4b4843e924d6477cb7ef75d989ad5e (patch) | |
tree | 6e3bf8844922f91b074df7d92c7877643482e034 | |
parent | 7e70ec2c0d38aeaf7bd06519e6bd12f4528eb23d (diff) | |
download | frameworks-native-bd7e03a6fa4b4843e924d6477cb7ef75d989ad5e.tar.gz frameworks-native-bd7e03a6fa4b4843e924d6477cb7ef75d989ad5e.tar.xz frameworks-native-bd7e03a6fa4b4843e924d6477cb7ef75d989ad5e.zip |
Limit Display-P3 surface formats to 8888
Discovered that FP16 and 1010102 may not be supported
for Swapchain. Since we don't have a query mechanism
defined, limit P3 to 8888 which must be supported.
Bug: 66706404
Test: adb -d shell am start -n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-VK.wsi.android.colorspace \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Change-Id: If537c631cd40610f6a62c437f8a7aff70f742fff
-rw-r--r-- | vulkan/libvulkan/swapchain.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index a346c0ac7..665a32b90 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp | |||
@@ -640,11 +640,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, | |||
640 | instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace); | 640 | instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace); |
641 | 641 | ||
642 | const VkSurfaceFormatKHR kWideColorFormats[] = { | 642 | const VkSurfaceFormatKHR kWideColorFormats[] = { |
643 | {VK_FORMAT_R16G16B16A16_SFLOAT, | 643 | {VK_FORMAT_R8G8B8A8_UNORM, |
644 | VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT}, | 644 | VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT}, |
645 | {VK_FORMAT_R16G16B16A16_SFLOAT, | 645 | {VK_FORMAT_R8G8B8A8_SRGB, |
646 | VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT}, | ||
647 | {VK_FORMAT_A2R10G10B10_UNORM_PACK32, | ||
648 | VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT}, | 646 | VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT}, |
649 | }; | 647 | }; |
650 | const uint32_t kNumWideColorFormats = | 648 | const uint32_t kNumWideColorFormats = |