diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index bec7fb3..23b379a 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -303,60 +303,60 @@
     VK_FORMAT_D16_UNORM_S8_UINT = 93,
     VK_FORMAT_D24_UNORM_S8_UINT = 94,
     VK_FORMAT_D32_SFLOAT_S8_UINT = 95,
-    VK_FORMAT_BC1_RGB_UNORM = 96,
-    VK_FORMAT_BC1_RGB_SRGB = 97,
-    VK_FORMAT_BC1_RGBA_UNORM = 98,
-    VK_FORMAT_BC1_RGBA_SRGB = 99,
-    VK_FORMAT_BC2_UNORM = 100,
-    VK_FORMAT_BC2_SRGB = 101,
-    VK_FORMAT_BC3_UNORM = 102,
-    VK_FORMAT_BC3_SRGB = 103,
-    VK_FORMAT_BC4_UNORM = 104,
-    VK_FORMAT_BC4_SNORM = 105,
-    VK_FORMAT_BC5_UNORM = 106,
-    VK_FORMAT_BC5_SNORM = 107,
-    VK_FORMAT_BC6H_UFLOAT = 108,
-    VK_FORMAT_BC6H_SFLOAT = 109,
-    VK_FORMAT_BC7_UNORM = 110,
-    VK_FORMAT_BC7_SRGB = 111,
-    VK_FORMAT_ETC2_R8G8B8_UNORM = 112,
-    VK_FORMAT_ETC2_R8G8B8_SRGB = 113,
-    VK_FORMAT_ETC2_R8G8B8A1_UNORM = 114,
-    VK_FORMAT_ETC2_R8G8B8A1_SRGB = 115,
-    VK_FORMAT_ETC2_R8G8B8A8_UNORM = 116,
-    VK_FORMAT_ETC2_R8G8B8A8_SRGB = 117,
-    VK_FORMAT_EAC_R11_UNORM = 118,
-    VK_FORMAT_EAC_R11_SNORM = 119,
-    VK_FORMAT_EAC_R11G11_UNORM = 120,
-    VK_FORMAT_EAC_R11G11_SNORM = 121,
-    VK_FORMAT_ASTC_4x4_UNORM = 122,
-    VK_FORMAT_ASTC_4x4_SRGB = 123,
-    VK_FORMAT_ASTC_5x4_UNORM = 124,
-    VK_FORMAT_ASTC_5x4_SRGB = 125,
-    VK_FORMAT_ASTC_5x5_UNORM = 126,
-    VK_FORMAT_ASTC_5x5_SRGB = 127,
-    VK_FORMAT_ASTC_6x5_UNORM = 128,
-    VK_FORMAT_ASTC_6x5_SRGB = 129,
-    VK_FORMAT_ASTC_6x6_UNORM = 130,
-    VK_FORMAT_ASTC_6x6_SRGB = 131,
-    VK_FORMAT_ASTC_8x5_UNORM = 132,
-    VK_FORMAT_ASTC_8x5_SRGB = 133,
-    VK_FORMAT_ASTC_8x6_UNORM = 134,
-    VK_FORMAT_ASTC_8x6_SRGB = 135,
-    VK_FORMAT_ASTC_8x8_UNORM = 136,
-    VK_FORMAT_ASTC_8x8_SRGB = 137,
-    VK_FORMAT_ASTC_10x5_UNORM = 138,
-    VK_FORMAT_ASTC_10x5_SRGB = 139,
-    VK_FORMAT_ASTC_10x6_UNORM = 140,
-    VK_FORMAT_ASTC_10x6_SRGB = 141,
-    VK_FORMAT_ASTC_10x8_UNORM = 142,
-    VK_FORMAT_ASTC_10x8_SRGB = 143,
-    VK_FORMAT_ASTC_10x10_UNORM = 144,
-    VK_FORMAT_ASTC_10x10_SRGB = 145,
-    VK_FORMAT_ASTC_12x10_UNORM = 146,
-    VK_FORMAT_ASTC_12x10_SRGB = 147,
-    VK_FORMAT_ASTC_12x12_UNORM = 148,
-    VK_FORMAT_ASTC_12x12_SRGB = 149,
+    VK_FORMAT_BC1_RGB_UNORM_BLOCK = 96,
+    VK_FORMAT_BC1_RGB_SRGB_BLOCK = 97,
+    VK_FORMAT_BC1_RGBA_UNORM_BLOCK = 98,
+    VK_FORMAT_BC1_RGBA_SRGB_BLOCK = 99,
+    VK_FORMAT_BC2_UNORM_BLOCK = 100,
+    VK_FORMAT_BC2_SRGB_BLOCK = 101,
+    VK_FORMAT_BC3_UNORM_BLOCK = 102,
+    VK_FORMAT_BC3_SRGB_BLOCK = 103,
+    VK_FORMAT_BC4_UNORM_BLOCK = 104,
+    VK_FORMAT_BC4_SNORM_BLOCK = 105,
+    VK_FORMAT_BC5_UNORM_BLOCK = 106,
+    VK_FORMAT_BC5_SNORM_BLOCK = 107,
+    VK_FORMAT_BC6H_UFLOAT_BLOCK = 108,
+    VK_FORMAT_BC6H_SFLOAT_BLOCK = 109,
+    VK_FORMAT_BC7_UNORM_BLOCK = 110,
+    VK_FORMAT_BC7_SRGB_BLOCK = 111,
+    VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK = 112,
+    VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK = 113,
+    VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK = 114,
+    VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK = 115,
+    VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK = 116,
+    VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK = 117,
+    VK_FORMAT_EAC_R11_UNORM_BLOCK = 118,
+    VK_FORMAT_EAC_R11_SNORM_BLOCK = 119,
+    VK_FORMAT_EAC_R11G11_UNORM_BLOCK = 120,
+    VK_FORMAT_EAC_R11G11_SNORM_BLOCK = 121,
+    VK_FORMAT_ASTC_4x4_UNORM_BLOCK = 122,
+    VK_FORMAT_ASTC_4x4_SRGB_BLOCK = 123,
+    VK_FORMAT_ASTC_5x4_UNORM_BLOCK = 124,
+    VK_FORMAT_ASTC_5x4_SRGB_BLOCK = 125,
+    VK_FORMAT_ASTC_5x5_UNORM_BLOCK = 126,
+    VK_FORMAT_ASTC_5x5_SRGB_BLOCK = 127,
+    VK_FORMAT_ASTC_6x5_UNORM_BLOCK = 128,
+    VK_FORMAT_ASTC_6x5_SRGB_BLOCK = 129,
+    VK_FORMAT_ASTC_6x6_UNORM_BLOCK = 130,
+    VK_FORMAT_ASTC_6x6_SRGB_BLOCK = 131,
+    VK_FORMAT_ASTC_8x5_UNORM_BLOCK = 132,
+    VK_FORMAT_ASTC_8x5_SRGB_BLOCK = 133,
+    VK_FORMAT_ASTC_8x6_UNORM_BLOCK = 134,
+    VK_FORMAT_ASTC_8x6_SRGB_BLOCK = 135,
+    VK_FORMAT_ASTC_8x8_UNORM_BLOCK = 136,
+    VK_FORMAT_ASTC_8x8_SRGB_BLOCK = 137,
+    VK_FORMAT_ASTC_10x5_UNORM_BLOCK = 138,
+    VK_FORMAT_ASTC_10x5_SRGB_BLOCK = 139,
+    VK_FORMAT_ASTC_10x6_UNORM_BLOCK = 140,
+    VK_FORMAT_ASTC_10x6_SRGB_BLOCK = 141,
+    VK_FORMAT_ASTC_10x8_UNORM_BLOCK = 142,
+    VK_FORMAT_ASTC_10x8_SRGB_BLOCK = 143,
+    VK_FORMAT_ASTC_10x10_UNORM_BLOCK = 144,
+    VK_FORMAT_ASTC_10x10_SRGB_BLOCK = 145,
+    VK_FORMAT_ASTC_12x10_UNORM_BLOCK = 146,
+    VK_FORMAT_ASTC_12x10_SRGB_BLOCK = 147,
+    VK_FORMAT_ASTC_12x12_UNORM_BLOCK = 148,
+    VK_FORMAT_ASTC_12x12_SRGB_BLOCK = 149,
     VK_FORMAT_B4G4R4A4_UNORM = 150,
     VK_FORMAT_B5G5R5A1_UNORM = 151,
     VK_FORMAT_B5G6R5_UNORM = 152,
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 66d8323..377cbbf 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -133,60 +133,60 @@
     { 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 @@
     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 @@
     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 @@
     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_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;
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index e2f49a6..f873833 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -405,61 +405,61 @@
         { VK_FORMAT_D16_UNORM_S8_UINT,     3,  2 },
         { VK_FORMAT_D24_UNORM_S8_UINT,     4,  2 },
         { VK_FORMAT_D32_SFLOAT_S8_UINT,    8,  2 },
-        { 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,         8,  4 },
-        { VK_FORMAT_BC2_UNORM,             16, 4 },
-        { VK_FORMAT_BC2_SRGB,              16, 4 },
-        { VK_FORMAT_BC3_UNORM,             16, 4 },
-        { VK_FORMAT_BC3_SRGB,              16, 4 },
-        { VK_FORMAT_BC4_UNORM,             8,  4 },
-        { VK_FORMAT_BC4_SNORM,             8,  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,              16, 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,         8,  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,              16, 4 },
+        { VK_FORMAT_BC4_UNORM_BLOCK,             8,  4 },
+        { VK_FORMAT_BC4_SNORM_BLOCK,             8,  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,              16, 4 },
         // TODO: Initialize remaining compressed formats.
-        { VK_FORMAT_ETC2_R8G8B8_UNORM,     0, 0 },
-        { VK_FORMAT_ETC2_R8G8B8_SRGB,      0, 0 },
-        { VK_FORMAT_ETC2_R8G8B8A1_UNORM,   0, 0 },
-        { VK_FORMAT_ETC2_R8G8B8A1_SRGB,    0, 0 },
-        { VK_FORMAT_ETC2_R8G8B8A8_UNORM,   0, 0 },
-        { VK_FORMAT_ETC2_R8G8B8A8_SRGB,    0, 0 },
-        { VK_FORMAT_EAC_R11_UNORM,         0, 0 },
-        { VK_FORMAT_EAC_R11_SNORM,         0, 0 },
-        { VK_FORMAT_EAC_R11G11_UNORM,      0, 0 },
-        { VK_FORMAT_EAC_R11G11_SNORM,      0, 0 },
-        { VK_FORMAT_ASTC_4x4_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_4x4_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_5x4_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_5x4_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_5x5_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_5x5_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_6x5_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_6x5_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_6x6_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_6x6_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_8x5_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_8x5_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_8x6_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_8x6_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_8x8_UNORM,        0, 0 },
-        { VK_FORMAT_ASTC_8x8_SRGB,         0, 0 },
-        { VK_FORMAT_ASTC_10x5_UNORM,       0, 0 },
-        { VK_FORMAT_ASTC_10x5_SRGB,        0, 0 },
-        { VK_FORMAT_ASTC_10x6_UNORM,       0, 0 },
-        { VK_FORMAT_ASTC_10x6_SRGB,        0, 0 },
-        { VK_FORMAT_ASTC_10x8_UNORM,       0, 0 },
-        { VK_FORMAT_ASTC_10x8_SRGB,        0, 0 },
-        { VK_FORMAT_ASTC_10x10_UNORM,      0, 0 },
-        { VK_FORMAT_ASTC_10x10_SRGB,       0, 0 },
-        { VK_FORMAT_ASTC_12x10_UNORM,      0, 0 },
-        { VK_FORMAT_ASTC_12x10_SRGB,       0, 0 },
-        { VK_FORMAT_ASTC_12x12_UNORM,      0, 0 },
-        { VK_FORMAT_ASTC_12x12_SRGB,       0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK,     0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK,      0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK,   0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK,    0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK,   0, 0 },
+        { VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK,    0, 0 },
+        { VK_FORMAT_EAC_R11_UNORM_BLOCK,         0, 0 },
+        { VK_FORMAT_EAC_R11_SNORM_BLOCK,         0, 0 },
+        { VK_FORMAT_EAC_R11G11_UNORM_BLOCK,      0, 0 },
+        { VK_FORMAT_EAC_R11G11_SNORM_BLOCK,      0, 0 },
+        { VK_FORMAT_ASTC_4x4_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_4x4_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_5x4_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_5x4_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_5x5_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_5x5_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_6x5_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_6x5_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_6x6_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_6x6_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_8x5_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_8x5_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_8x6_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_8x6_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_8x8_UNORM_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_8x8_SRGB_BLOCK,         0, 0 },
+        { VK_FORMAT_ASTC_10x5_UNORM_BLOCK,       0, 0 },
+        { VK_FORMAT_ASTC_10x5_SRGB_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_10x6_UNORM_BLOCK,       0, 0 },
+        { VK_FORMAT_ASTC_10x6_SRGB_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_10x8_UNORM_BLOCK,       0, 0 },
+        { VK_FORMAT_ASTC_10x8_SRGB_BLOCK,        0, 0 },
+        { VK_FORMAT_ASTC_10x10_UNORM_BLOCK,      0, 0 },
+        { VK_FORMAT_ASTC_10x10_SRGB_BLOCK,       0, 0 },
+        { VK_FORMAT_ASTC_12x10_UNORM_BLOCK,      0, 0 },
+        { VK_FORMAT_ASTC_12x10_SRGB_BLOCK,       0, 0 },
+        { VK_FORMAT_ASTC_12x12_UNORM_BLOCK,      0, 0 },
+        { VK_FORMAT_ASTC_12x12_SRGB_BLOCK,       0, 0 },
         { VK_FORMAT_B4G4R4A4_UNORM,        2, 4 },
         { VK_FORMAT_B5G5R5A1_UNORM,        2, 4 },
         { VK_FORMAT_B5G6R5_UNORM,          2, 3 },