Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5819e848 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter Committed by android-build-merger
Browse files

Merge "Limit Display-P3 surface formats to 8888" into oc-mr1-dev am: 8c6462c8

am: 8c8e81c2

Change-Id: Ie94c829a3a4bf0dce6b3d5781eeed6341e51b114
parents 0a9f7d05 8c8e81c2
Loading
Loading
Loading
Loading
+3 −5
Original line number Original line Diff line number Diff line
@@ -640,11 +640,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,
        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);


    const VkSurfaceFormatKHR kWideColorFormats[] = {
    const VkSurfaceFormatKHR kWideColorFormats[] = {
        {VK_FORMAT_R16G16B16A16_SFLOAT,
        {VK_FORMAT_R8G8B8A8_UNORM,
         VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT},
         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
        {VK_FORMAT_R16G16B16A16_SFLOAT,
        {VK_FORMAT_R8G8B8A8_SRGB,
         VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT},
        {VK_FORMAT_A2R10G10B10_UNORM_PACK32,
         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
    };
    };
    const uint32_t kNumWideColorFormats =
    const uint32_t kNumWideColorFormats =