Revert "layers: Clang-format changes for files in layers dir of repo"

This reverts commit e260acfb96ea20945149ede6a250ef622ca7fd03.
The clang-format changes need to be postponed until just prior
to public release to facilitate MRs.

1 files changed, 224 insertions, 342 deletions

diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index dd59186d..db433dc7 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -34,349 +34,215 @@
 #include "vulkan/vulkan.h"
 #include "vk_layer_utils.h"
 
+
 typedef struct _VULKAN_FORMAT_INFO {
-    size_t size;
-    uint32_t channel_count;
-    VkFormatCompatibilityClass format_class;
+    size_t                      size;
+    uint32_t                    channel_count;
+    VkFormatCompatibilityClass  format_class;
 } VULKAN_FORMAT_INFO;
 
+
 // Set up data structure with number of bytes and number of channels
 // for each Vulkan format.
 static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
-    {0, 0, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_UNDEFINED]
-    {1, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_8_BIT}, //    [VK_FORMAT_R4G4_UNORM_PACK8]
-    {2, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R4G4B4A4_UNORM_PACK16]
-    {2, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_B4G4R4A4_UNORM_PACK16]
-    {2, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R5G6B5_UNORM_PACK16]
-    {2, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_B5G6R5_UNORM_PACK16]
-    {2, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]
-    {2, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_B5G5R5A1_UNORM_PACK16]
-    {2, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_A1R5G5B5_UNORM_PACK16]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_UNORM]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_SNORM]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_USCALED]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_SSCALED]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_UINT]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_SINT]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT},  //    [VK_FORMAT_R8_SRGB]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_UNORM]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_SNORM]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_USCALED]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_SSCALED]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_UINT]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_SINT]
-    {2, 2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R8G8_SRGB]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_UNORM]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_SNORM]
-    {3, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_USCALED]
-    {3, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_SSCALED]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_UINT]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_SINT]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_R8G8B8_SRGB]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_UNORM]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_SNORM]
-    {3, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_USCALED]
-    {3, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_SSCALED]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_UINT]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_SINT]
-    {3, 3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT}, //    [VK_FORMAT_B8G8R8_SRGB]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_UNORM]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_SNORM]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_USCALED]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_SSCALED]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_UINT]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_SINT]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R8G8B8A8_SRGB]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_UNORM]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_SNORM]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_USCALED]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_SSCALED]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_UINT]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_SINT]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_SRGB]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_UNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_SNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_USCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_SSCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_UINT_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A8B8G8R8_SINT_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B8G8R8A8_SRGB_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_UNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_SNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_USCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_SSCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_UINT_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2R10G10B10_SINT_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_UNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_SNORM_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_USCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_SSCALED_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_UINT_PACK32]
-    {4, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_A2B10G10R10_SINT_PACK32]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_UNORM]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_SNORM]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_USCALED]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_SSCALED]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_UINT]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_SINT]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT}, //    [VK_FORMAT_R16_SFLOAT]
-    {4, 2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_UNORM]
-    {4, 2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_SNORM]
-    {4, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_USCALED]
-    {4, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_SSCALED]
-    {4, 2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_UINT]
-    {4, 2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_SINT]
-    {4, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R16G16_SFLOAT]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_UNORM]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_SNORM]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_USCALED]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_SSCALED]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_UINT]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_SINT]
-    {6, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_48_BIT}, //    [VK_FORMAT_R16G16B16_SFLOAT]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_UNORM]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_SNORM]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_USCALED]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_SSCALED]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_UINT]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_SINT]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R16G16B16A16_SFLOAT]
-    {4, 1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R32_UINT]
-    {4, 1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R32_SINT]
-    {4, 1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_R32_SFLOAT]
-    {8, 2, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R32G32_UINT]
-    {8, 2, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R32G32_SINT]
-    {8, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R32G32_SFLOAT]
-    {12, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_96_BIT}, //    [VK_FORMAT_R32G32B32_UINT]
-    {12, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_96_BIT}, //    [VK_FORMAT_R32G32B32_SINT]
-    {12, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_96_BIT}, //    [VK_FORMAT_R32G32B32_SFLOAT]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R32G32B32A32_UINT]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R32G32B32A32_SINT]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R32G32B32A32_SFLOAT]
-    {8, 1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R64_UINT]
-    {8, 1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R64_SINT]
-    {8, 1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT}, //    [VK_FORMAT_R64_SFLOAT]
-    {16, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R64G64_UINT]
-    {16, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R64G64_SINT]
-    {16, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_128_BIT}, //    [VK_FORMAT_R64G64_SFLOAT]
-    {24, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_192_BIT}, //    [VK_FORMAT_R64G64B64_UINT]
-    {24, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_192_BIT}, //    [VK_FORMAT_R64G64B64_SINT]
-    {24, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_192_BIT}, //    [VK_FORMAT_R64G64B64_SFLOAT]
-    {32, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_256_BIT}, //    [VK_FORMAT_R64G64B64A64_UINT]
-    {32, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_256_BIT}, //    [VK_FORMAT_R64G64B64A64_SINT]
-    {32, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_256_BIT}, //    [VK_FORMAT_R64G64B64A64_SFLOAT]
-    {4, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_B10G11R11_UFLOAT_PACK32]
-    {4, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_32_BIT}, //    [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32]
-    {2, 1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_D16_UNORM]
-    {3, 1,
-     VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_X8_D24_UNORM_PACK32]
-    {4, 1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_D32_SFLOAT]
-    {1, 1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_S8_UINT]
-    {3, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_D16_UNORM_S8_UINT]
-    {4, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_D24_UNORM_S8_UINT]
-    {4, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT}, //    [VK_FORMAT_D32_SFLOAT_S8_UINT]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGB_BIT}, //    [VK_FORMAT_BC1_RGB_UNORM_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGB_BIT}, //    [VK_FORMAT_BC1_RGB_SRGB_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGBA_BIT}, //    [VK_FORMAT_BC1_RGBA_UNORM_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGBA_BIT}, //    [VK_FORMAT_BC1_RGBA_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC2_BIT}, //    [VK_FORMAT_BC2_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC2_BIT}, //    [VK_FORMAT_BC2_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC3_BIT}, //    [VK_FORMAT_BC3_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC3_BIT}, //    [VK_FORMAT_BC3_SRGB_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC4_BIT}, //    [VK_FORMAT_BC4_UNORM_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC4_BIT}, //    [VK_FORMAT_BC4_SNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC5_BIT}, //    [VK_FORMAT_BC5_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC5_BIT}, //    [VK_FORMAT_BC5_SNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC6H_BIT}, //    [VK_FORMAT_BC6H_UFLOAT_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC6H_BIT}, //    [VK_FORMAT_BC6H_SFLOAT_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC7_BIT}, //    [VK_FORMAT_BC7_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_BC7_BIT}, //    [VK_FORMAT_BC7_SRGB_BLOCK]
-    {8, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGB_BIT}, //    [VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK]
-    {8, 3,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGB_BIT}, //    [VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGBA_BIT}, //    [VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGBA_BIT}, //    [VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_EAC_RGBA_BIT}, //    [VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK]
-    {8, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ETC2_EAC_RGBA_BIT}, // [VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK]
-    {8, 1,
-     VK_FORMAT_COMPATIBILITY_CLASS_EAC_R_BIT}, //    [VK_FORMAT_EAC_R11_UNORM_BLOCK]
-    {8, 1,
-     VK_FORMAT_COMPATIBILITY_CLASS_EAC_R_BIT}, //    [VK_FORMAT_EAC_R11_SNORM_BLOCK]
-    {16, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_EAC_RG_BIT}, //    [VK_FORMAT_EAC_R11G11_UNORM_BLOCK]
-    {16, 2,
-     VK_FORMAT_COMPATIBILITY_CLASS_EAC_RG_BIT}, //    [VK_FORMAT_EAC_R11G11_SNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_4X4_BIT}, //    [VK_FORMAT_ASTC_4x4_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_4X4_BIT}, //    [VK_FORMAT_ASTC_4x4_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X4_BIT}, //    [VK_FORMAT_ASTC_5x4_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X4_BIT}, //    [VK_FORMAT_ASTC_5x4_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X5_BIT}, //    [VK_FORMAT_ASTC_5x5_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X5_BIT}, //    [VK_FORMAT_ASTC_5x5_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X5_BIT}, //    [VK_FORMAT_ASTC_6x5_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X5_BIT}, //    [VK_FORMAT_ASTC_6x5_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X6_BIT}, //    [VK_FORMAT_ASTC_6x6_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X6_BIT}, //    [VK_FORMAT_ASTC_6x6_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X5_BIT}, //    [VK_FORMAT_ASTC_8x5_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X5_BIT}, //    [VK_FORMAT_ASTC_8x5_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X6_BIT}, //    [VK_FORMAT_ASTC_8x6_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X6_BIT}, //    [VK_FORMAT_ASTC_8x6_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X8_BIT}, //    [VK_FORMAT_ASTC_8x8_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X8_BIT}, //    [VK_FORMAT_ASTC_8x8_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X5_BIT}, //    [VK_FORMAT_ASTC_10x5_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X5_BIT}, //    [VK_FORMAT_ASTC_10x5_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X6_BIT}, //    [VK_FORMAT_ASTC_10x6_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X6_BIT}, //    [VK_FORMAT_ASTC_10x6_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X8_BIT}, //    [VK_FORMAT_ASTC_10x8_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X8_BIT}, //    [VK_FORMAT_ASTC_10x8_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X10_BIT}, //    [VK_FORMAT_ASTC_10x10_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X10_BIT}, //    [VK_FORMAT_ASTC_10x10_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X10_BIT}, //    [VK_FORMAT_ASTC_12x10_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X10_BIT}, //    [VK_FORMAT_ASTC_12x10_SRGB_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X12_BIT}, //    [VK_FORMAT_ASTC_12x12_UNORM_BLOCK]
-    {16, 4,
-     VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X12_BIT}, //    [VK_FORMAT_ASTC_12x12_SRGB_BLOCK]
+    { 0,  0, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_UNDEFINED]
+    { 1,  2, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R4G4_UNORM_PACK8]
+    { 2,  4, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R4G4B4A4_UNORM_PACK16]
+    { 2,  4, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_B4G4R4A4_UNORM_PACK16]
+    { 2,  3, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R5G6B5_UNORM_PACK16]
+    { 2,  3, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_B5G6R5_UNORM_PACK16]
+    { 2,  4, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]
+    { 2,  4, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_B5G5R5A1_UNORM_PACK16]
+    { 2,  4, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_A1R5G5B5_UNORM_PACK16]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_UNORM]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },              //    [VK_FORMAT_R8_SNORM]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_USCALED]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_SSCALED]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_UINT]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_SINT]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_8_BIT },             //    [VK_FORMAT_R8_SRGB]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_UNORM]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_SNORM]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_USCALED]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_SSCALED]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_UINT]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_SINT]
+    { 2,  2, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R8G8_SRGB]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_UNORM]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_SNORM]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_USCALED]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_SSCALED]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_UINT]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_SINT]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_R8G8B8_SRGB]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_UNORM]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_SNORM]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_USCALED]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_SSCALED]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_UINT]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_SINT]
+    { 3,  3, VK_FORMAT_COMPATIBILITY_CLASS_24_BIT },            //    [VK_FORMAT_B8G8R8_SRGB]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_UNORM]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_SNORM]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_USCALED]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_SSCALED]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_UINT]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_SINT]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R8G8B8A8_SRGB]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_UNORM]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_SNORM]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_USCALED]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_SSCALED]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_UINT]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_SINT]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_SRGB]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_UNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_SNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_USCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_SSCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_UINT_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A8B8G8R8_SINT_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B8G8R8A8_SRGB_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_UNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_SNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_USCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_SSCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_UINT_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2R10G10B10_SINT_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_UNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_SNORM_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_USCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_SSCALED_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_UINT_PACK32]
+    { 4,  4, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_A2B10G10R10_SINT_PACK32]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_UNORM]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_SNORM]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_USCALED]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_SSCALED]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_UINT]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_SINT]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_16_BIT },            //    [VK_FORMAT_R16_SFLOAT]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_UNORM]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_SNORM]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_USCALED]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_SSCALED]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_UINT]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_SINT]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R16G16_SFLOAT]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_UNORM]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_SNORM]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_USCALED]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_SSCALED]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_UINT]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_SINT]
+    { 6,  3, VK_FORMAT_COMPATIBILITY_CLASS_48_BIT },            //    [VK_FORMAT_R16G16B16_SFLOAT]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_UNORM]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_SNORM]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_USCALED]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_SSCALED]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_UINT]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_SINT]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R16G16B16A16_SFLOAT]
+    { 4,  1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R32_UINT]
+    { 4,  1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R32_SINT]
+    { 4,  1, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_R32_SFLOAT]
+    { 8,  2, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R32G32_UINT]
+    { 8,  2, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R32G32_SINT]
+    { 8,  2, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R32G32_SFLOAT]
+    { 12, 3, VK_FORMAT_COMPATIBILITY_CLASS_96_BIT },            //    [VK_FORMAT_R32G32B32_UINT]
+    { 12, 3, VK_FORMAT_COMPATIBILITY_CLASS_96_BIT },            //    [VK_FORMAT_R32G32B32_SINT]
+    { 12, 3, VK_FORMAT_COMPATIBILITY_CLASS_96_BIT },            //    [VK_FORMAT_R32G32B32_SFLOAT]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R32G32B32A32_UINT]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R32G32B32A32_SINT]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R32G32B32A32_SFLOAT]
+    { 8,  1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R64_UINT]
+    { 8,  1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R64_SINT]
+    { 8,  1, VK_FORMAT_COMPATIBILITY_CLASS_64_BIT },            //    [VK_FORMAT_R64_SFLOAT]
+    { 16, 2, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R64G64_UINT]
+    { 16, 2, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R64G64_SINT]
+    { 16, 2, VK_FORMAT_COMPATIBILITY_CLASS_128_BIT },           //    [VK_FORMAT_R64G64_SFLOAT]
+    { 24, 3, VK_FORMAT_COMPATIBILITY_CLASS_192_BIT },           //    [VK_FORMAT_R64G64B64_UINT]
+    { 24, 3, VK_FORMAT_COMPATIBILITY_CLASS_192_BIT },           //    [VK_FORMAT_R64G64B64_SINT]
+    { 24, 3, VK_FORMAT_COMPATIBILITY_CLASS_192_BIT },           //    [VK_FORMAT_R64G64B64_SFLOAT]
+    { 32, 4, VK_FORMAT_COMPATIBILITY_CLASS_256_BIT },           //    [VK_FORMAT_R64G64B64A64_UINT]
+    { 32, 4, VK_FORMAT_COMPATIBILITY_CLASS_256_BIT },           //    [VK_FORMAT_R64G64B64A64_SINT]
+    { 32, 4, VK_FORMAT_COMPATIBILITY_CLASS_256_BIT },           //    [VK_FORMAT_R64G64B64A64_SFLOAT]
+    { 4,  3, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_B10G11R11_UFLOAT_PACK32]
+    { 4,  3, VK_FORMAT_COMPATIBILITY_CLASS_32_BIT },            //    [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32]
+    { 2,  1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_D16_UNORM]
+    { 3,  1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_X8_D24_UNORM_PACK32]
+    { 4,  1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_D32_SFLOAT]
+    { 1,  1, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_S8_UINT]
+    { 3,  2, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_D16_UNORM_S8_UINT]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_D24_UNORM_S8_UINT]
+    { 4,  2, VK_FORMAT_COMPATIBILITY_CLASS_NONE_BIT },          //    [VK_FORMAT_D32_SFLOAT_S8_UINT]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGB_BIT },       //    [VK_FORMAT_BC1_RGB_UNORM_BLOCK]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGB_BIT },       //    [VK_FORMAT_BC1_RGB_SRGB_BLOCK]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGBA_BIT },      //    [VK_FORMAT_BC1_RGBA_UNORM_BLOCK]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC1_RGBA_BIT },      //    [VK_FORMAT_BC1_RGBA_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC2_BIT },           //    [VK_FORMAT_BC2_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC2_BIT },           //    [VK_FORMAT_BC2_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC3_BIT },           //    [VK_FORMAT_BC3_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC3_BIT },           //    [VK_FORMAT_BC3_SRGB_BLOCK]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC4_BIT },           //    [VK_FORMAT_BC4_UNORM_BLOCK]
+    { 8,  4, VK_FORMAT_COMPATIBILITY_CLASS_BC4_BIT },           //    [VK_FORMAT_BC4_SNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC5_BIT },           //    [VK_FORMAT_BC5_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC5_BIT },           //    [VK_FORMAT_BC5_SNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC6H_BIT },          //    [VK_FORMAT_BC6H_UFLOAT_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC6H_BIT },          //    [VK_FORMAT_BC6H_SFLOAT_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC7_BIT },           //    [VK_FORMAT_BC7_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_BC7_BIT },           //    [VK_FORMAT_BC7_SRGB_BLOCK]
+    {  8, 3, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGB_BIT },      //    [VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK]
+    {  8, 3, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGB_BIT },      //    [VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK]
+    {  8, 4, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGBA_BIT },     //    [VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK]
+    {  8, 4, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_RGBA_BIT },     //    [VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK]
+    {  8, 4, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_EAC_RGBA_BIT }, //    [VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK]
+    {  8, 4, VK_FORMAT_COMPATIBILITY_CLASS_ETC2_EAC_RGBA_BIT }, // [VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK]
+    {  8, 1, VK_FORMAT_COMPATIBILITY_CLASS_EAC_R_BIT },         //    [VK_FORMAT_EAC_R11_UNORM_BLOCK]
+    {  8, 1, VK_FORMAT_COMPATIBILITY_CLASS_EAC_R_BIT },         //    [VK_FORMAT_EAC_R11_SNORM_BLOCK]
+    { 16, 2, VK_FORMAT_COMPATIBILITY_CLASS_EAC_RG_BIT },        //    [VK_FORMAT_EAC_R11G11_UNORM_BLOCK]
+    { 16, 2, VK_FORMAT_COMPATIBILITY_CLASS_EAC_RG_BIT },        //    [VK_FORMAT_EAC_R11G11_SNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_4X4_BIT },      //    [VK_FORMAT_ASTC_4x4_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_4X4_BIT },      //    [VK_FORMAT_ASTC_4x4_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X4_BIT },      //    [VK_FORMAT_ASTC_5x4_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X4_BIT },      //    [VK_FORMAT_ASTC_5x4_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X5_BIT },      //    [VK_FORMAT_ASTC_5x5_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_5X5_BIT },      //    [VK_FORMAT_ASTC_5x5_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X5_BIT },      //    [VK_FORMAT_ASTC_6x5_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X5_BIT },      //    [VK_FORMAT_ASTC_6x5_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X6_BIT },      //    [VK_FORMAT_ASTC_6x6_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_6X6_BIT },      //    [VK_FORMAT_ASTC_6x6_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X5_BIT },      //    [VK_FORMAT_ASTC_8x5_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X5_BIT },      //    [VK_FORMAT_ASTC_8x5_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X6_BIT },      //    [VK_FORMAT_ASTC_8x6_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X6_BIT },      //    [VK_FORMAT_ASTC_8x6_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X8_BIT },      //    [VK_FORMAT_ASTC_8x8_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_8X8_BIT },      //    [VK_FORMAT_ASTC_8x8_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X5_BIT },     //    [VK_FORMAT_ASTC_10x5_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X5_BIT },     //    [VK_FORMAT_ASTC_10x5_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X6_BIT },     //    [VK_FORMAT_ASTC_10x6_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X6_BIT },     //    [VK_FORMAT_ASTC_10x6_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X8_BIT },     //    [VK_FORMAT_ASTC_10x8_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X8_BIT },     //    [VK_FORMAT_ASTC_10x8_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X10_BIT },    //    [VK_FORMAT_ASTC_10x10_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_10X10_BIT },    //    [VK_FORMAT_ASTC_10x10_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X10_BIT },    //    [VK_FORMAT_ASTC_12x10_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X10_BIT },    //    [VK_FORMAT_ASTC_12x10_SRGB_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X12_BIT },    //    [VK_FORMAT_ASTC_12x12_UNORM_BLOCK]
+    { 16, 4, VK_FORMAT_COMPATIBILITY_CLASS_ASTC_12X12_BIT },    //    [VK_FORMAT_ASTC_12x12_SRGB_BLOCK]
 };
 
 // Return true if format is a depth or stencil format
-bool vk_format_is_depth_or_stencil(VkFormat format) {
+bool vk_format_is_depth_or_stencil(VkFormat format)
+{
     return (vk_format_is_depth_and_stencil(format) ||
-            vk_format_is_depth_only(format) ||
+            vk_format_is_depth_only(format)        ||
             vk_format_is_stencil_only(format));
 }
 
 // Return true if format contains depth and stencil information
-bool vk_format_is_depth_and_stencil(VkFormat format) {
+bool vk_format_is_depth_and_stencil(VkFormat format)
+{
     bool is_ds = false;
 
     switch (format) {
@@ -392,12 +258,14 @@ bool vk_format_is_depth_and_stencil(VkFormat format) {
 }
 
 // Return true if format is a stencil-only format
-bool vk_format_is_stencil_only(VkFormat format) {
+bool vk_format_is_stencil_only(VkFormat format)
+{
     return (format == VK_FORMAT_S8_UINT);
 }
 
 // Return true if format is a depth-only format
-bool vk_format_is_depth_only(VkFormat format) {
+bool vk_format_is_depth_only(VkFormat format)
+{
     bool is_depth = false;
 
     switch (format) {
@@ -414,7 +282,8 @@ bool vk_format_is_depth_only(VkFormat format) {
 }
 
 // Return true if format is of time UNORM
-bool vk_format_is_norm(VkFormat format) {
+bool vk_format_is_norm(VkFormat format)
+{
     bool is_norm = false;
 
     switch (format) {
@@ -488,13 +357,16 @@ bool vk_format_is_norm(VkFormat format) {
     return is_norm;
 };
 
+
 // Return true if format is an integer format
-bool vk_format_is_int(VkFormat format) {
+bool vk_format_is_int(VkFormat format)
+{
     return (vk_format_is_sint(format) || vk_format_is_uint(format));
 }
 
 // Return true if format is an unsigned integer format
-bool vk_format_is_uint(VkFormat format) {
+bool vk_format_is_uint(VkFormat format)
+{
     bool is_uint = false;
 
     switch (format) {
@@ -529,7 +401,8 @@ bool vk_format_is_uint(VkFormat format) {
 }
 
 // Return true if format is a signed integer format
-bool vk_format_is_sint(VkFormat format) {
+bool vk_format_is_sint(VkFormat format)
+{
     bool is_sint = false;
 
     switch (format) {
@@ -564,7 +437,8 @@ bool vk_format_is_sint(VkFormat format) {
 }
 
 // Return true if format is a floating-point format
-bool vk_format_is_float(VkFormat format) {
+bool vk_format_is_float(VkFormat format)
+{
     bool is_float = false;
 
     switch (format) {
@@ -594,7 +468,8 @@ bool vk_format_is_float(VkFormat format) {
 }
 
 // Return true if format is in the SRGB colorspace
-bool vk_format_is_srgb(VkFormat format) {
+bool vk_format_is_srgb(VkFormat format)
+{
     bool is_srgb = false;
 
     switch (format) {
@@ -636,7 +511,8 @@ bool vk_format_is_srgb(VkFormat format) {
 }
 
 // Return true if format is compressed
-bool vk_format_is_compressed(VkFormat format) {
+bool vk_format_is_compressed(VkFormat format)
+{
     switch (format) {
     case VK_FORMAT_BC1_RGB_UNORM_BLOCK:
     case VK_FORMAT_BC1_RGB_SRGB_BLOCK:
@@ -697,25 +573,31 @@ bool vk_format_is_compressed(VkFormat format) {
 }
 
 // Return format class of the specified format
-VkFormatCompatibilityClass vk_format_get_compatibility_class(VkFormat format) {
+VkFormatCompatibilityClass vk_format_get_compatibility_class(VkFormat format)
+{
     return vk_format_table[format].format_class;
 }
 
 // Return size, in bytes, of a pixel of the specified format
-size_t vk_format_get_size(VkFormat format) {
+size_t vk_format_get_size(VkFormat format)
+{
     return vk_format_table[format].size;
 }
 
 // Return the number of channels for a given format
-unsigned int vk_format_get_channel_count(VkFormat format) {
+unsigned int vk_format_get_channel_count(VkFormat format)
+{
     return vk_format_table[format].channel_count;
 }
 
 // Perform a zero-tolerant modulo operation
-VkDeviceSize vk_safe_modulo(VkDeviceSize dividend, VkDeviceSize divisor) {
+VkDeviceSize vk_safe_modulo(VkDeviceSize dividend, VkDeviceSize divisor)
+{
     VkDeviceSize result = 0;
     if (divisor != 0) {
         result = dividend % divisor;
     }
     return result;
 }
+
+