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

Commit 2734c0f3 authored by Ian Elliott's avatar Ian Elliott Committed by android-build-merger
Browse files

Merge "Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR"" am: 19c8513c 

am: 445ec6d2

Change-Id: I9ef61f438d186011142f9c0802a0eab4dbb99b4f
parents c4e84556 445ec6d2

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;