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

Commit 562431f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "swapchain: Don't call native_window_get_wide_color_support"

parents b234cf07 b1de3b10

vulkan/libvulkan/swapchain.cpp

+1 −21
Original line number Diff line number Diff line
@@ -754,7 +754,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 


    const InstanceData& instance_data = GetData(pdev);



    bool wide_color_support = false;

    uint64_t consumer_usage = 0;

    bool colorspace_ext =

        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
@@ -765,27 +764,15 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
        if (!surfaceless_enabled) {

            return VK_ERROR_SURFACE_LOST_KHR;

        }

        // Support for VK_GOOGLE_surfaceless_query.  The EGL loader

        // unconditionally supports wide color formats, even if they will cause

        // a SurfaceFlinger fallback.  Based on that, wide_color_support will be

        // set to true in this case.

        wide_color_support = true;

        // Support for VK_GOOGLE_surfaceless_query.



        // TODO(b/203826952): research proper value; temporarily use the

        // values seen on Pixel

        consumer_usage = AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY;

    } else {

        Surface& surface = *SurfaceFromHandle(surface_handle);

        int err = native_window_get_wide_color_support(surface.window.get(),

                                                       &wide_color_support);

        if (err) {

            return VK_ERROR_SURFACE_LOST_KHR;

        }

        ALOGV("wide_color_support is: %d", wide_color_support);



        consumer_usage = surface.consumer_usage;

    }

    wide_color_support = wide_color_support && colorspace_ext;



    AHardwareBuffer_Desc desc = {};

    desc.width = 1;
@@ -807,9 +794,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
            VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_PASS_THROUGH_EXT});

        all_formats.emplace_back(VkSurfaceFormatKHR{

            VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_BT709_LINEAR_EXT});

    }



    if (wide_color_support) {

        all_formats.emplace_back(VkSurfaceFormatKHR{

            VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT});

        all_formats.emplace_back(VkSurfaceFormatKHR{
@@ -839,8 +823,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
            all_formats.emplace_back(

                VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,

                                   VK_COLOR_SPACE_PASS_THROUGH_EXT});

        }

        if (wide_color_support) {

            all_formats.emplace_back(

                VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,

                                   VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT});
@@ -859,8 +841,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
            all_formats.emplace_back(

                VkSurfaceFormatKHR{VK_FORMAT_A2B10G10R10_UNORM_PACK32,

                                   VK_COLOR_SPACE_PASS_THROUGH_EXT});

        }

        if (wide_color_support) {

            all_formats.emplace_back(

                VkSurfaceFormatKHR{VK_FORMAT_A2B10G10R10_UNORM_PACK32,

                                   VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT});