bug 12998 part 1: append _BLOCK to compressed formats

s/VK_FORMAT_BC1_RGB_UNORM\b/VK_FORMAT_BC1_RGB_UNORM_BLOCK/g
s/VK_FORMAT_BC1_RGB_SRGB\b/VK_FORMAT_BC1_RGB_SRGB_BLOCK/g
s/VK_FORMAT_BC1_RGBA_UNORM\b/VK_FORMAT_BC1_RGBA_UNORM_BLOCK/g
s/VK_FORMAT_BC1_RGBA_SRGB\b/VK_FORMAT_BC1_RGBA_SRGB_BLOCK/g
s/VK_FORMAT_BC2_UNORM\b/VK_FORMAT_BC2_UNORM_BLOCK/g
s/VK_FORMAT_BC2_SRGB\b/VK_FORMAT_BC2_SRGB_BLOCK/g
s/VK_FORMAT_BC3_UNORM\b/VK_FORMAT_BC3_UNORM_BLOCK/g
s/VK_FORMAT_BC3_SRGB\b/VK_FORMAT_BC3_SRGB_BLOCK/g
s/VK_FORMAT_BC4_UNORM\b/VK_FORMAT_BC4_UNORM_BLOCK/g
s/VK_FORMAT_BC4_SNORM\b/VK_FORMAT_BC4_SNORM_BLOCK/g
s/VK_FORMAT_BC5_UNORM\b/VK_FORMAT_BC5_UNORM_BLOCK/g
s/VK_FORMAT_BC5_SNORM\b/VK_FORMAT_BC5_SNORM_BLOCK/g
s/VK_FORMAT_BC6H_UFLOAT\b/VK_FORMAT_BC6H_UFLOAT_BLOCK/g
s/VK_FORMAT_BC6H_SFLOAT\b/VK_FORMAT_BC6H_SFLOAT_BLOCK/g
s/VK_FORMAT_BC7_UNORM\b/VK_FORMAT_BC7_UNORM_BLOCK/g
s/VK_FORMAT_BC7_SRGB\b/VK_FORMAT_BC7_SRGB_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8_UNORM\b/VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8A1_UNORM\b/VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8A8_UNORM\b/VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK/g
s/VK_FORMAT_EAC_R11_UNORM\b/VK_FORMAT_EAC_R11_UNORM_BLOCK/g
s/VK_FORMAT_EAC_R11_SNORM\b/VK_FORMAT_EAC_R11_SNORM_BLOCK/g
s/VK_FORMAT_EAC_R11G11_UNORM\b/VK_FORMAT_EAC_R11G11_UNORM_BLOCK/g
s/VK_FORMAT_EAC_R11G11_SNORM\b/VK_FORMAT_EAC_R11G11_SNORM_BLOCK/g
s/VK_FORMAT_ASTC_4x4_UNORM\b/VK_FORMAT_ASTC_4x4_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_4x4_SRGB\b/VK_FORMAT_ASTC_4x4_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_5x4_UNORM\b/VK_FORMAT_ASTC_5x4_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_5x4_SRGB\b/VK_FORMAT_ASTC_5x4_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_5x5_UNORM\b/VK_FORMAT_ASTC_5x5_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_5x5_SRGB\b/VK_FORMAT_ASTC_5x5_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_6x5_UNORM\b/VK_FORMAT_ASTC_6x5_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_6x5_SRGB\b/VK_FORMAT_ASTC_6x5_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_6x6_UNORM\b/VK_FORMAT_ASTC_6x6_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_6x6_SRGB\b/VK_FORMAT_ASTC_6x6_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_8x5_UNORM\b/VK_FORMAT_ASTC_8x5_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_8x5_SRGB\b/VK_FORMAT_ASTC_8x5_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_8x6_UNORM\b/VK_FORMAT_ASTC_8x6_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_8x6_SRGB\b/VK_FORMAT_ASTC_8x6_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_8x8_UNORM\b/VK_FORMAT_ASTC_8x8_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_8x8_SRGB\b/VK_FORMAT_ASTC_8x8_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_10x5_UNORM\b/VK_FORMAT_ASTC_10x5_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_10x5_SRGB\b/VK_FORMAT_ASTC_10x5_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_10x6_UNORM\b/VK_FORMAT_ASTC_10x6_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_10x6_SRGB\b/VK_FORMAT_ASTC_10x6_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_10x8_UNORM\b/VK_FORMAT_ASTC_10x8_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_10x8_SRGB\b/VK_FORMAT_ASTC_10x8_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_10x10_UNORM\b/VK_FORMAT_ASTC_10x10_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_10x10_SRGB\b/VK_FORMAT_ASTC_10x10_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_12x10_UNORM\b/VK_FORMAT_ASTC_12x10_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_12x10_SRGB\b/VK_FORMAT_ASTC_12x10_SRGB_BLOCK/g
s/VK_FORMAT_ASTC_12x12_UNORM\b/VK_FORMAT_ASTC_12x12_UNORM_BLOCK/g
s/VK_FORMAT_ASTC_12x12_SRGB\b/VK_FORMAT_ASTC_12x12_SRGB_BLOCK/g
s/STR(BC1_RGB_UNORM\b/STR(BC1_RGB_UNORM_BLOCK/g
s/STR(BC1_RGB_SRGB\b/STR(BC1_RGB_SRGB_BLOCK/g
s/STR(BC1_RGBA_UNORM\b/STR(BC1_RGBA_UNORM_BLOCK/g
s/STR(BC1_RGBA_SRGB\b/STR(BC1_RGBA_SRGB_BLOCK/g
s/STR(BC2_UNORM\b/STR(BC2_UNORM_BLOCK/g
s/STR(BC2_SRGB\b/STR(BC2_SRGB_BLOCK/g
s/STR(BC3_UNORM\b/STR(BC3_UNORM_BLOCK/g
s/STR(BC3_SRGB\b/STR(BC3_SRGB_BLOCK/g
s/STR(BC4_UNORM\b/STR(BC4_UNORM_BLOCK/g
s/STR(BC4_SNORM\b/STR(BC4_SNORM_BLOCK/g
s/STR(BC5_UNORM\b/STR(BC5_UNORM_BLOCK/g
s/STR(BC5_SNORM\b/STR(BC5_SNORM_BLOCK/g
s/STR(BC6H_UFLOAT\b/STR(BC6H_UFLOAT_BLOCK/g
s/STR(BC6H_SFLOAT\b/STR(BC6H_SFLOAT_BLOCK/g
s/STR(BC7_UNORM\b/STR(BC7_UNORM_BLOCK/g
s/STR(BC7_SRGB\b/STR(BC7_SRGB_BLOCK/g
s/STR(ETC2_R8G8B8_UNORM\b/STR(ETC2_R8G8B8_UNORM_BLOCK/g
s/STR(ETC2_R8G8B8A1_UNORM\b/STR(ETC2_R8G8B8A1_UNORM_BLOCK/g
s/STR(ETC2_R8G8B8A8_UNORM\b/STR(ETC2_R8G8B8A8_UNORM_BLOCK/g
s/STR(EAC_R11_UNORM\b/STR(EAC_R11_UNORM_BLOCK/g
s/STR(EAC_R11_SNORM\b/STR(EAC_R11_SNORM_BLOCK/g
s/STR(EAC_R11G11_UNORM\b/STR(EAC_R11G11_UNORM_BLOCK/g
s/STR(EAC_R11G11_SNORM\b/STR(EAC_R11G11_SNORM_BLOCK/g
s/STR(ASTC_4x4_UNORM\b/STR(ASTC_4x4_UNORM_BLOCK/g
s/STR(ASTC_4x4_SRGB\b/STR(ASTC_4x4_SRGB_BLOCK/g
s/STR(ASTC_5x4_UNORM\b/STR(ASTC_5x4_UNORM_BLOCK/g
s/STR(ASTC_5x4_SRGB\b/STR(ASTC_5x4_SRGB_BLOCK/g
s/STR(ASTC_5x5_UNORM\b/STR(ASTC_5x5_UNORM_BLOCK/g
s/STR(ASTC_5x5_SRGB\b/STR(ASTC_5x5_SRGB_BLOCK/g
s/STR(ASTC_6x5_UNORM\b/STR(ASTC_6x5_UNORM_BLOCK/g
s/STR(ASTC_6x5_SRGB\b/STR(ASTC_6x5_SRGB_BLOCK/g
s/STR(ASTC_6x6_UNORM\b/STR(ASTC_6x6_UNORM_BLOCK/g
s/STR(ASTC_6x6_SRGB\b/STR(ASTC_6x6_SRGB_BLOCK/g
s/STR(ASTC_8x5_UNORM\b/STR(ASTC_8x5_UNORM_BLOCK/g
s/STR(ASTC_8x5_SRGB\b/STR(ASTC_8x5_SRGB_BLOCK/g
s/STR(ASTC_8x6_UNORM\b/STR(ASTC_8x6_UNORM_BLOCK/g
s/STR(ASTC_8x6_SRGB\b/STR(ASTC_8x6_SRGB_BLOCK/g
s/STR(ASTC_8x8_UNORM\b/STR(ASTC_8x8_UNORM_BLOCK/g
s/STR(ASTC_8x8_SRGB\b/STR(ASTC_8x8_SRGB_BLOCK/g
s/STR(ASTC_10x5_UNORM\b/STR(ASTC_10x5_UNORM_BLOCK/g
s/STR(ASTC_10x5_SRGB\b/STR(ASTC_10x5_SRGB_BLOCK/g
s/STR(ASTC_10x6_UNORM\b/STR(ASTC_10x6_UNORM_BLOCK/g
s/STR(ASTC_10x6_SRGB\b/STR(ASTC_10x6_SRGB_BLOCK/g
s/STR(ASTC_10x8_UNORM\b/STR(ASTC_10x8_UNORM_BLOCK/g
s/STR(ASTC_10x8_SRGB\b/STR(ASTC_10x8_SRGB_BLOCK/g
s/STR(ASTC_10x10_UNORM\b/STR(ASTC_10x10_UNORM_BLOCK/g
s/STR(ASTC_10x10_SRGB\b/STR(ASTC_10x10_SRGB_BLOCK/g
s/STR(ASTC_12x10_UNORM\b/STR(ASTC_12x10_UNORM_BLOCK/g
s/STR(ASTC_12x10_SRGB\b/STR(ASTC_12x10_SRGB_BLOCK/g
s/STR(ASTC_12x12_UNORM\b/STR(ASTC_12x12_UNORM_BLOCK/g
s/STR(ASTC_12x12_SRGB\b/STR(ASTC_12x12_SRGB_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8_SRGB\b/VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8A1_SRGB\b/VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK/g
s/VK_FORMAT_ETC2_R8G8B8A8_SRGB\b/VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK/g

1 files changed, 158 insertions, 158 deletions

diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 66d8323b..377cbbfd 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -133,60 +133,60 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 3,  2 }, //    [VK_FORMAT_D16_UNORM_S8_UINT]
     { 4,  2 }, //    [VK_FORMAT_D24_UNORM_S8_UINT]
     { 4,  2 }, //    [VK_FORMAT_D32_SFLOAT_S8_UINT]
-    { 8,  4 }, //    [VK_FORMAT_BC1_RGB_UNORM]
-    { 8,  4 }, //    [VK_FORMAT_BC1_RGB_SRGB]
-    { 8,  4 }, //    [VK_FORMAT_BC1_RGBA_UNORM]
-    { 8,  4 }, //    [VK_FORMAT_BC1_RGBA_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_BC2_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC2_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_BC3_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC3_SRGB]
-    { 8,  4 }, //    [VK_FORMAT_BC4_UNORM]
-    { 8,  4 }, //    [VK_FORMAT_BC4_SNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC5_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC5_SNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC6H_UFLOAT]
-    { 16, 4 }, //    [VK_FORMAT_BC6H_SFLOAT]
-    { 16, 4 }, //    [VK_FORMAT_BC7_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_BC7_SRGB]
-    { 8, 3 },  //    [VK_FORMAT_ETC2_R8G8B8_UNORM]
-    { 8, 3 },  //    [VK_FORMAT_ETC2_R8G8B8_SRGB]
-    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A1_UNORM]
-    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A1_SRGB]
-    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A8_UNORM]
-    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A8_SRGB]
-    { 8, 1 },  //    [VK_FORMAT_EAC_R11_UNORM]
-    { 8, 1 },  //    [VK_FORMAT_EAC_R11_SNORM]
-    { 16, 2 }, //    [VK_FORMAT_EAC_R11G11_UNORM]
-    { 16, 2 }, //    [VK_FORMAT_EAC_R11G11_SNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_4x4_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_4x4_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_5x4_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_5x4_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_5x5_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_5x5_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_6x5_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_6x5_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_6x6_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_6x6_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x5_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x5_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x6_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x6_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x8_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_8x8_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x5_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x5_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x6_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x6_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x8_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x8_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x10_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_10x10_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_12x10_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_12x10_SRGB]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_12x12_UNORM]
-    { 16, 4 }, //    [VK_FORMAT_ASTC_12x12_SRGB]
+    { 8,  4 }, //    [VK_FORMAT_BC1_RGB_UNORM_BLOCK]
+    { 8,  4 }, //    [VK_FORMAT_BC1_RGB_SRGB_BLOCK]
+    { 8,  4 }, //    [VK_FORMAT_BC1_RGBA_UNORM_BLOCK]
+    { 8,  4 }, //    [VK_FORMAT_BC1_RGBA_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC2_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC2_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC3_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC3_SRGB_BLOCK]
+    { 8,  4 }, //    [VK_FORMAT_BC4_UNORM_BLOCK]
+    { 8,  4 }, //    [VK_FORMAT_BC4_SNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC5_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC5_SNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC6H_UFLOAT_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC6H_SFLOAT_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC7_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_BC7_SRGB_BLOCK]
+    { 8, 3 },  //    [VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK]
+    { 8, 3 },  //    [VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK]
+    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK]
+    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK]
+    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK]
+    { 8, 4 },  //    [VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK]
+    { 8, 1 },  //    [VK_FORMAT_EAC_R11_UNORM_BLOCK]
+    { 8, 1 },  //    [VK_FORMAT_EAC_R11_SNORM_BLOCK]
+    { 16, 2 }, //    [VK_FORMAT_EAC_R11G11_UNORM_BLOCK]
+    { 16, 2 }, //    [VK_FORMAT_EAC_R11G11_SNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_4x4_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_4x4_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_5x4_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_5x4_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_5x5_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_5x5_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_6x5_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_6x5_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_6x6_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_6x6_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x5_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x5_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x6_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x6_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x8_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_8x8_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x5_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x5_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x6_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x6_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x8_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x8_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x10_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_10x10_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_12x10_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_12x10_SRGB_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_12x12_UNORM_BLOCK]
+    { 16, 4 }, //    [VK_FORMAT_ASTC_12x12_SRGB_BLOCK]
     { 2, 3 },  //    [VK_FORMAT_B5G6R5_UNORM]
     { 2, 3 },  //    [VK_FORMAT_B5G6R5_USCALED]
     { 3, 3 },  //    [VK_FORMAT_B8G8R8_UNORM]
@@ -288,35 +288,35 @@ bool vk_format_is_norm(VkFormat format)
     case VK_FORMAT_R16G16B16_SNORM:
     case VK_FORMAT_R16G16B16A16_UNORM:
     case VK_FORMAT_R16G16B16A16_SNORM:
-    case VK_FORMAT_BC1_RGB_UNORM:
-    case VK_FORMAT_BC2_UNORM:
-    case VK_FORMAT_BC3_UNORM:
-    case VK_FORMAT_BC4_UNORM:
-    case VK_FORMAT_BC4_SNORM:
-    case VK_FORMAT_BC5_UNORM:
-    case VK_FORMAT_BC5_SNORM:
-    case VK_FORMAT_BC7_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8A1_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8A8_UNORM:
-    case VK_FORMAT_EAC_R11_UNORM:
-    case VK_FORMAT_EAC_R11_SNORM:
-    case VK_FORMAT_EAC_R11G11_UNORM:
-    case VK_FORMAT_EAC_R11G11_SNORM:
-    case VK_FORMAT_ASTC_4x4_UNORM:
-    case VK_FORMAT_ASTC_5x4_UNORM:
-    case VK_FORMAT_ASTC_5x5_UNORM:
-    case VK_FORMAT_ASTC_6x5_UNORM:
-    case VK_FORMAT_ASTC_6x6_UNORM:
-    case VK_FORMAT_ASTC_8x5_UNORM:
-    case VK_FORMAT_ASTC_8x6_UNORM:
-    case VK_FORMAT_ASTC_8x8_UNORM:
-    case VK_FORMAT_ASTC_10x5_UNORM:
-    case VK_FORMAT_ASTC_10x6_UNORM:
-    case VK_FORMAT_ASTC_10x8_UNORM:
-    case VK_FORMAT_ASTC_10x10_UNORM:
-    case VK_FORMAT_ASTC_12x10_UNORM:
-    case VK_FORMAT_ASTC_12x12_UNORM:
+    case VK_FORMAT_BC1_RGB_UNORM_BLOCK:
+    case VK_FORMAT_BC2_UNORM_BLOCK:
+    case VK_FORMAT_BC3_UNORM_BLOCK:
+    case VK_FORMAT_BC4_UNORM_BLOCK:
+    case VK_FORMAT_BC4_SNORM_BLOCK:
+    case VK_FORMAT_BC5_UNORM_BLOCK:
+    case VK_FORMAT_BC5_SNORM_BLOCK:
+    case VK_FORMAT_BC7_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK:
+    case VK_FORMAT_EAC_R11_UNORM_BLOCK:
+    case VK_FORMAT_EAC_R11_SNORM_BLOCK:
+    case VK_FORMAT_EAC_R11G11_UNORM_BLOCK:
+    case VK_FORMAT_EAC_R11G11_SNORM_BLOCK:
+    case VK_FORMAT_ASTC_4x4_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_5x4_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_5x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_6x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_6x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x8_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x8_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x10_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_12x10_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_12x12_UNORM_BLOCK:
     case VK_FORMAT_B5G6R5_UNORM:
     case VK_FORMAT_B8G8R8_UNORM:
     case VK_FORMAT_B8G8R8_SNORM:
@@ -422,8 +422,8 @@ bool vk_format_is_float(VkFormat format)
     case VK_FORMAT_R64G64B64A64_SFLOAT:
     case VK_FORMAT_R11G11B10_UFLOAT:
     case VK_FORMAT_R9G9B9E5_UFLOAT:
-    case VK_FORMAT_BC6H_UFLOAT:
-    case VK_FORMAT_BC6H_SFLOAT:
+    case VK_FORMAT_BC6H_UFLOAT_BLOCK:
+    case VK_FORMAT_BC6H_SFLOAT_BLOCK:
         is_float = true;
         break;
     default:
@@ -443,27 +443,27 @@ bool vk_format_is_srgb(VkFormat format)
     case VK_FORMAT_R8G8_SRGB:
     case VK_FORMAT_R8G8B8_SRGB:
     case VK_FORMAT_R8G8B8A8_SRGB:
-    case VK_FORMAT_BC1_RGB_SRGB:
-    case VK_FORMAT_BC2_SRGB:
-    case VK_FORMAT_BC3_SRGB:
-    case VK_FORMAT_BC7_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8A1_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8A8_SRGB:
-    case VK_FORMAT_ASTC_4x4_SRGB:
-    case VK_FORMAT_ASTC_5x4_SRGB:
-    case VK_FORMAT_ASTC_5x5_SRGB:
-    case VK_FORMAT_ASTC_6x5_SRGB:
-    case VK_FORMAT_ASTC_6x6_SRGB:
-    case VK_FORMAT_ASTC_8x5_SRGB:
-    case VK_FORMAT_ASTC_8x6_SRGB:
-    case VK_FORMAT_ASTC_8x8_SRGB:
-    case VK_FORMAT_ASTC_10x5_SRGB:
-    case VK_FORMAT_ASTC_10x6_SRGB:
-    case VK_FORMAT_ASTC_10x8_SRGB:
-    case VK_FORMAT_ASTC_10x10_SRGB:
-    case VK_FORMAT_ASTC_12x10_SRGB:
-    case VK_FORMAT_ASTC_12x12_SRGB:
+    case VK_FORMAT_BC1_RGB_SRGB_BLOCK:
+    case VK_FORMAT_BC2_SRGB_BLOCK:
+    case VK_FORMAT_BC3_SRGB_BLOCK:
+    case VK_FORMAT_BC7_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_4x4_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_5x4_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_5x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_6x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_6x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x8_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x8_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x10_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_12x10_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_12x12_SRGB_BLOCK:
     case VK_FORMAT_B8G8R8_SRGB:
     case VK_FORMAT_B8G8R8A8_SRGB:
         is_srgb = true;
@@ -479,58 +479,58 @@ bool vk_format_is_srgb(VkFormat format)
 bool vk_format_is_compressed(VkFormat format)
 {
     switch (format) {
-    case VK_FORMAT_BC1_RGB_UNORM:
-    case VK_FORMAT_BC1_RGB_SRGB:
-    case VK_FORMAT_BC2_UNORM:
-    case VK_FORMAT_BC2_SRGB:
-    case VK_FORMAT_BC3_UNORM:
-    case VK_FORMAT_BC3_SRGB:
-    case VK_FORMAT_BC4_UNORM:
-    case VK_FORMAT_BC4_SNORM:
-    case VK_FORMAT_BC5_UNORM:
-    case VK_FORMAT_BC5_SNORM:
-    case VK_FORMAT_BC6H_UFLOAT:
-    case VK_FORMAT_BC6H_SFLOAT:
-    case VK_FORMAT_BC7_UNORM:
-    case VK_FORMAT_BC7_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8A1_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8A1_SRGB:
-    case VK_FORMAT_ETC2_R8G8B8A8_UNORM:
-    case VK_FORMAT_ETC2_R8G8B8A8_SRGB:
-    case VK_FORMAT_EAC_R11_UNORM:
-    case VK_FORMAT_EAC_R11_SNORM:
-    case VK_FORMAT_EAC_R11G11_UNORM:
-    case VK_FORMAT_EAC_R11G11_SNORM:
-    case VK_FORMAT_ASTC_4x4_UNORM:
-    case VK_FORMAT_ASTC_4x4_SRGB:
-    case VK_FORMAT_ASTC_5x4_UNORM:
-    case VK_FORMAT_ASTC_5x4_SRGB:
-    case VK_FORMAT_ASTC_5x5_UNORM:
-    case VK_FORMAT_ASTC_5x5_SRGB:
-    case VK_FORMAT_ASTC_6x5_UNORM:
-    case VK_FORMAT_ASTC_6x5_SRGB:
-    case VK_FORMAT_ASTC_6x6_UNORM:
-    case VK_FORMAT_ASTC_6x6_SRGB:
-    case VK_FORMAT_ASTC_8x5_UNORM:
-    case VK_FORMAT_ASTC_8x5_SRGB:
-    case VK_FORMAT_ASTC_8x6_UNORM:
-    case VK_FORMAT_ASTC_8x6_SRGB:
-    case VK_FORMAT_ASTC_8x8_UNORM:
-    case VK_FORMAT_ASTC_8x8_SRGB:
-    case VK_FORMAT_ASTC_10x5_UNORM:
-    case VK_FORMAT_ASTC_10x5_SRGB:
-    case VK_FORMAT_ASTC_10x6_UNORM:
-    case VK_FORMAT_ASTC_10x6_SRGB:
-    case VK_FORMAT_ASTC_10x8_UNORM:
-    case VK_FORMAT_ASTC_10x8_SRGB:
-    case VK_FORMAT_ASTC_10x10_UNORM:
-    case VK_FORMAT_ASTC_10x10_SRGB:
-    case VK_FORMAT_ASTC_12x10_UNORM:
-    case VK_FORMAT_ASTC_12x10_SRGB:
-    case VK_FORMAT_ASTC_12x12_UNORM:
-    case VK_FORMAT_ASTC_12x12_SRGB:
+    case VK_FORMAT_BC1_RGB_UNORM_BLOCK:
+    case VK_FORMAT_BC1_RGB_SRGB_BLOCK:
+    case VK_FORMAT_BC2_UNORM_BLOCK:
+    case VK_FORMAT_BC2_SRGB_BLOCK:
+    case VK_FORMAT_BC3_UNORM_BLOCK:
+    case VK_FORMAT_BC3_SRGB_BLOCK:
+    case VK_FORMAT_BC4_UNORM_BLOCK:
+    case VK_FORMAT_BC4_SNORM_BLOCK:
+    case VK_FORMAT_BC5_UNORM_BLOCK:
+    case VK_FORMAT_BC5_SNORM_BLOCK:
+    case VK_FORMAT_BC6H_UFLOAT_BLOCK:
+    case VK_FORMAT_BC6H_SFLOAT_BLOCK:
+    case VK_FORMAT_BC7_UNORM_BLOCK:
+    case VK_FORMAT_BC7_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK:
+    case VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK:
+    case VK_FORMAT_EAC_R11_UNORM_BLOCK:
+    case VK_FORMAT_EAC_R11_SNORM_BLOCK:
+    case VK_FORMAT_EAC_R11G11_UNORM_BLOCK:
+    case VK_FORMAT_EAC_R11G11_SNORM_BLOCK:
+    case VK_FORMAT_ASTC_4x4_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_4x4_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_5x4_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_5x4_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_5x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_5x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_6x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_6x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_6x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_6x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_8x8_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_8x8_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x5_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x5_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x6_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x6_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x8_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x8_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_10x10_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_10x10_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_12x10_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_12x10_SRGB_BLOCK:
+    case VK_FORMAT_ASTC_12x12_UNORM_BLOCK:
+    case VK_FORMAT_ASTC_12x12_SRGB_BLOCK:
         return true;
     default:
         return false;