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

Commit 2239611c authored by Ian Elliott's avatar Ian Elliott
Browse files

Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR" 

This reverts commit 94ace213.

The Android Vulkan loader has never queried what formats are available for use
with swapchains; but has always hard-coded a list of formats.  All initial
Vulkan 1.0/1.1 drivers on Android supported those formats in order to work.
The change being reverted added to the hard-coded list, but not all drivers
support those formats for use by swapchains.  A future extension will be
created to allow the swapchain code to query which formats can be supported.

Bug: b/124942437
Test: mm
parent e8d0bd63

vulkan/libvulkan/swapchain.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -718,8 +718,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
        {VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R5G6B5_UNORM_PACK16, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R5G6B5_UNORM_PACK16, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_A2B10G10R10_UNORM_PACK32, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

        {VK_FORMAT_R16G16B16A16_SFLOAT, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

    };

    };

    const uint32_t kNumFormats = sizeof(kFormats) / sizeof(kFormats[0]);

    const uint32_t kNumFormats = sizeof(kFormats) / sizeof(kFormats[0]);

    uint32_t total_num_formats = kNumFormats;

    uint32_t total_num_formats = kNumFormats;