From 2239611cfcbc1300cf4d7c98aed618c248193187 Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Fri, 25 Oct 2019 12:00:11 -0600 Subject: Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR" This reverts commit 94ace213b8369237726860a20cafb9d80fd52dd8. 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 --- vulkan/libvulkan/swapchain.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'vulkan') diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index cc0df08835..fbf6d0d233 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -718,8 +718,6 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, {VK_FORMAT_R8G8B8A8_UNORM, 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_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]); uint32_t total_num_formats = kNumFormats; -- cgit v1.2.3