summaryrefslogtreecommitdiff
path: root/vulkan
diff options
context:
space:
mode:
authorIan Elliott <ianelliott@google.com>2019-10-25 13:54:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-25 13:54:53 -0700
commit2734c0f3b6d66799719c7788c19bf4e6409922fa (patch)
treea9023e0cdc7c177fb9a51394a83092594bc49075 /vulkan
parentc4e845566d4b314aa4982ed9262ed4975dc6fe0a (diff)
parent445ec6d2cf00337acd5f5d066bb724e46ef9ca81 (diff)
downloadnative-2734c0f3b6d66799719c7788c19bf4e6409922fa.tar.gz
Merge "Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR"" am: 19c8513c7b
am: 445ec6d2cf Change-Id: I9ef61f438d186011142f9c0802a0eab4dbb99b4f
Diffstat (limited to 'vulkan')
-rw-r--r--vulkan/libvulkan/swapchain.cpp2
1 files changed, 0 insertions, 2 deletions
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;