From 225ca3ac5b93aeaec52d5742f828accdcb5e42a1 Mon Sep 17 00:00:00 2001
From: squidbus <175574877+squidbus@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:43:41 -0700
Subject: [PATCH] Update format list for rebase and sort and remove duplicates.

---
 .../renderer_vulkan/liverpool_to_vk.cpp       | 90 +++++++++----------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp
index 893089ef..90d97404 100644
--- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp
+++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp
@@ -283,62 +283,58 @@ vk::BorderColor BorderColor(AmdGpu::BorderColor color) {
 
 std::span<const vk::Format> GetAllFormats() {
     static constexpr std::array formats{
-        vk::Format::eR8Uint,
-        vk::Format::eR8G8Uint,
-        vk::Format::eR32Uint,
-        vk::Format::eR32G32Uint,
-        vk::Format::eR32G32B32A32Uint,
-        vk::Format::eR32G32B32A32Sfloat,
-        vk::Format::eR32G32B32Uint,
-        vk::Format::eR8G8B8A8Unorm,
-        vk::Format::eB8G8R8A8Unorm,
-        vk::Format::eR8G8B8A8Srgb,
-        vk::Format::eB8G8R8A8Srgb,
-        vk::Format::eR32G32B32Sfloat,
-        vk::Format::eR32G32Sfloat,
+        vk::Format::eA2B10G10R10UnormPack32,
+        vk::Format::eA2R10G10B10SnormPack32,
+        vk::Format::eA2R10G10B10UnormPack32,
         vk::Format::eB5G6R5UnormPack16,
-        vk::Format::eR5G6B5UnormPack16,
-        vk::Format::eR8Unorm,
+        vk::Format::eB8G8R8A8Srgb,
+        vk::Format::eB8G8R8A8Unorm,
+        vk::Format::eB10G11R11UfloatPack32,
+        vk::Format::eBc1RgbaSrgbBlock,
+        vk::Format::eBc1RgbaUnormBlock,
+        vk::Format::eBc2UnormBlock,
         vk::Format::eBc3SrgbBlock,
         vk::Format::eBc3UnormBlock,
         vk::Format::eBc4UnormBlock,
         vk::Format::eBc5UnormBlock,
-        vk::Format::eR16G16B16A16Sint,
-        vk::Format::eR16G16Sfloat,
-        vk::Format::eB10G11R11UfloatPack32,
-        vk::Format::eA2B10G10R10UnormPack32,
         vk::Format::eBc7SrgbBlock,
-        vk::Format::eBc1RgbaUnormBlock,
-        vk::Format::eR8G8B8A8Uint,
-        vk::Format::eR16Sfloat,
-        vk::Format::eR32Sfloat,
-        vk::Format::eR16G16B16A16Sfloat,
-        vk::Format::eR32Uint,
-        vk::Format::eR32Sint,
-        vk::Format::eR8G8Unorm,
-        vk::Format::eR8G8Snorm,
         vk::Format::eBc7UnormBlock,
-        vk::Format::eBc2UnormBlock,
-        vk::Format::eR16G16Snorm,
-        vk::Format::eA2R10G10B10UnormPack32,
-        vk::Format::eA2R10G10B10SnormPack32,
-        vk::Format::eB10G11R11UfloatPack32,
-        vk::Format::eR16G16Sfloat,
-        vk::Format::eR16G16B16A16Snorm,
-        vk::Format::eR32G32Uint,
-        vk::Format::eR4G4B4A4UnormPack16,
-        vk::Format::eR16G16B16A16Uint,
-        vk::Format::eR32G32B32A32Uint,
-        vk::Format::eR8Sint,
-        vk::Format::eBc1RgbaSrgbBlock,
-        vk::Format::eR16G16Sint,
-        vk::Format::eR8G8B8A8Uscaled,
-        vk::Format::eR16Unorm,
-        vk::Format::eR16G16B16A16Unorm,
-        vk::Format::eD32SfloatS8Uint,
-        vk::Format::eD32Sfloat,
         vk::Format::eD16Unorm,
         vk::Format::eD16UnormS8Uint,
+        vk::Format::eD32Sfloat,
+        vk::Format::eD32SfloatS8Uint,
+        vk::Format::eR4G4B4A4UnormPack16,
+        vk::Format::eR5G6B5UnormPack16,
+        vk::Format::eR8G8B8A8Srgb,
+        vk::Format::eR8G8B8A8Uint,
+        vk::Format::eR8G8B8A8Unorm,
+        vk::Format::eR8G8B8A8Uscaled,
+        vk::Format::eR8G8Snorm,
+        vk::Format::eR8G8Uint,
+        vk::Format::eR8G8Unorm,
+        vk::Format::eR8Sint,
+        vk::Format::eR8Uint,
+        vk::Format::eR8Unorm,
+        vk::Format::eR16G16B16A16Sfloat,
+        vk::Format::eR16G16B16A16Sint,
+        vk::Format::eR16G16B16A16Snorm,
+        vk::Format::eR16G16B16A16Uint,
+        vk::Format::eR16G16B16A16Unorm,
+        vk::Format::eR16G16Sfloat,
+        vk::Format::eR16G16Sint,
+        vk::Format::eR16G16Snorm,
+        vk::Format::eR16Sfloat,
+        vk::Format::eR16Unorm,
+        vk::Format::eR32G32B32A32Sfloat,
+        vk::Format::eR32G32B32A32Sint,
+        vk::Format::eR32G32B32A32Uint,
+        vk::Format::eR32G32B32Sfloat,
+        vk::Format::eR32G32B32Uint,
+        vk::Format::eR32G32Sfloat,
+        vk::Format::eR32G32Uint,
+        vk::Format::eR32Sfloat,
+        vk::Format::eR32Sint,
+        vk::Format::eR32Uint,
     };
     return formats;
 }