bug 12998 part 3: append _PACK* to remaining packed formats

s/VK_FORMAT_R4G4_UNORM\b/VK_FORMAT_R4G4_UNORM_PACK8/g
s/VK_FORMAT_B4G4R4A4_UNORM\b/VK_FORMAT_B4G4R4A4_UNORM_PACK16/g
s/VK_FORMAT_B5G6R5_UNORM\b/VK_FORMAT_B5G6R5_UNORM_PACK16/g
s/VK_FORMAT_R5G6B5_UNORM\b/VK_FORMAT_R5G6B5_UNORM_PACK16/g
s/VK_FORMAT_B5G5R5A1_UNORM\b/VK_FORMAT_B5G5R5A1_UNORM_PACK16/g
s/VK_FORMAT_R5G5B5A1_UNORM\b/VK_FORMAT_R5G5B5A1_UNORM_PACK16/g
s/STR(R4G4_UNORM\b/STR(R4G4_UNORM_PACK8/g
s/STR(B4G4R4A4_UNORM\b/STR(B4G4R4A4_UNORM_PACK16/g
s/STR(B5G6R5_UNORM\b/STR(B5G6R5_UNORM_PACK16/g
s/STR(R5G6B5_UNORM\b/STR(R5G6B5_UNORM_PACK16/g
s/STR(B5G5R5A1_UNORM\b/STR(B5G5R5A1_UNORM_PACK16/g
s/STR(R5G5B5A1_UNORM\b/STR(R5G5B5A1_UNORM_PACK16/g
s/VK_FORMAT_R4G4B4A4_UNORM/VK_FORMAT_R4G4B4A4_UNORM_PACK16/g
s/STR(R4G4B4A4_UNORM/STR(R4G4B4A4_UNORM_PACK16/g

4 files changed, 37 insertions, 37 deletions

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index d3850809..cbb674e2 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -170,13 +170,13 @@ static const char *vk_format_string(VkFormat fmt)
     switch (fmt) {
 #define STR(r) case VK_FORMAT_ ##r: return #r
     STR(UNDEFINED);
-    STR(R4G4_UNORM);
+    STR(R4G4_UNORM_PACK8);
     STR(R4G4_USCALED);
-    STR(R4G4B4A4_UNORM);
+    STR(R4G4B4A4_UNORM_PACK16);
     STR(R4G4B4A4_USCALED);
-    STR(R5G6B5_UNORM);
+    STR(R5G6B5_UNORM_PACK16);
     STR(R5G6B5_USCALED);
-    STR(R5G5B5A1_UNORM);
+    STR(R5G5B5A1_UNORM_PACK16);
     STR(R5G5B5A1_USCALED);
     STR(R8_UNORM);
     STR(R8_SNORM);
@@ -314,7 +314,7 @@ static const char *vk_format_string(VkFormat fmt)
     STR(ASTC_12x10_SRGB_BLOCK);
     STR(ASTC_12x12_UNORM_BLOCK);
     STR(ASTC_12x12_SRGB_BLOCK);
-    STR(B5G6R5_UNORM);
+    STR(B5G6R5_UNORM_PACK16);
     STR(B5G6R5_USCALED);
     STR(B8G8R8_UNORM);
     STR(B8G8R8_SNORM);
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index daa73f7d..6c2dc599 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -36,13 +36,13 @@ static const struct icd_format_info {
     uint32_t channel_count;
 } icd_format_table[VK_FORMAT_RANGE_SIZE] = {
     [VK_FORMAT_UNDEFINED]            = { 0,  0 },
-    [VK_FORMAT_R4G4_UNORM]           = { 1,  2 },
+    [VK_FORMAT_R4G4_UNORM_PACK8]           = { 1,  2 },
     [VK_FORMAT_R4G4_USCALED]         = { 1,  2 },
-    [VK_FORMAT_R4G4B4A4_UNORM]       = { 2,  4 },
+    [VK_FORMAT_R4G4B4A4_UNORM_PACK16]       = { 2,  4 },
     [VK_FORMAT_R4G4B4A4_USCALED]     = { 2,  4 },
-    [VK_FORMAT_R5G6B5_UNORM]         = { 2,  3 },
+    [VK_FORMAT_R5G6B5_UNORM_PACK16]         = { 2,  3 },
     [VK_FORMAT_R5G6B5_USCALED]       = { 2,  3 },
-    [VK_FORMAT_R5G5B5A1_UNORM]       = { 2,  4 },
+    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]       = { 2,  4 },
     [VK_FORMAT_R5G5B5A1_USCALED]     = { 2,  4 },
     [VK_FORMAT_R8_UNORM]             = { 1,  1 },
     [VK_FORMAT_R8_SNORM]             = { 1,  1 },
@@ -183,7 +183,7 @@ static const struct icd_format_info {
     [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_B5G6R5_UNORM]         = { 2, 3 },
+    [VK_FORMAT_B5G6R5_UNORM_PACK16]         = { 2, 3 },
     [VK_FORMAT_B5G6R5_USCALED]       = { 2, 3 },
     [VK_FORMAT_B8G8R8_UNORM]         = { 3, 3 },
     [VK_FORMAT_B8G8R8_SNORM]         = { 3, 3 },
@@ -233,10 +233,10 @@ bool icd_format_is_norm(VkFormat format)
     bool is_norm = false;
 
     switch (format) {
-    case VK_FORMAT_R4G4_UNORM:
-    case VK_FORMAT_R4G4B4A4_UNORM:
-    case VK_FORMAT_R5G6B5_UNORM:
-    case VK_FORMAT_R5G5B5A1_UNORM:
+    case VK_FORMAT_R4G4_UNORM_PACK8:
+    case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
+    case VK_FORMAT_R5G6B5_UNORM_PACK16:
+    case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
     case VK_FORMAT_R8_UNORM:
     case VK_FORMAT_R8_SNORM:
     case VK_FORMAT_R8G8_UNORM:
@@ -284,7 +284,7 @@ bool icd_format_is_norm(VkFormat format)
     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_B5G6R5_UNORM_PACK16:
     case VK_FORMAT_B8G8R8_UNORM:
     case VK_FORMAT_B8G8R8_SNORM:
     case VK_FORMAT_B8G8R8A8_UNORM:
@@ -494,30 +494,30 @@ void icd_format_get_raw_value(VkFormat format,
     switch (format) {
     case VK_FORMAT_UNDEFINED:
         break;
-    case VK_FORMAT_R4G4_UNORM:
+    case VK_FORMAT_R4G4_UNORM_PACK8:
     case VK_FORMAT_R4G4_USCALED:
         ((uint8_t *) value)[0]  = (color[0] & 0xf) << 0   |
                                   (color[1] & 0xf) << 4;
         break;
-    case VK_FORMAT_R4G4B4A4_UNORM:
+    case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
     case VK_FORMAT_R4G4B4A4_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0xf) << 0   |
                                   (color[1] & 0xf) << 4   |
                                   (color[2] & 0xf) << 8   |
                                   (color[3] & 0xf) << 12;
         break;
-    case VK_FORMAT_R5G6B5_UNORM:
+    case VK_FORMAT_R5G6B5_UNORM_PACK16:
     case VK_FORMAT_R5G6B5_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0x1f) << 0  |
                                   (color[1] & 0x3f) << 5  |
                                   (color[2] & 0x1f) << 11;
         break;
-    case VK_FORMAT_B5G6R5_UNORM:
+    case VK_FORMAT_B5G6R5_UNORM_PACK16:
         ((uint16_t *) value)[0] = (color[2] & 0x1f) << 0  |
                                   (color[1] & 0x3f) << 5  |
                                   (color[0] & 0x1f) << 11;
         break;
-    case VK_FORMAT_R5G5B5A1_UNORM:
+    case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
     case VK_FORMAT_R5G5B5A1_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0x1f) << 0  |
                                   (color[1] & 0x1f) << 5  |
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 2087b518..6580697e 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -208,13 +208,13 @@ typedef enum VkInternalAllocationType {
 
 typedef enum VkFormat {
     VK_FORMAT_UNDEFINED = 0,
-    VK_FORMAT_R4G4_UNORM = 1,
+    VK_FORMAT_R4G4_UNORM_PACK8 = 1,
     VK_FORMAT_R4G4_USCALED = 2,
-    VK_FORMAT_R4G4B4A4_UNORM = 3,
+    VK_FORMAT_R4G4B4A4_UNORM_PACK16 = 3,
     VK_FORMAT_R4G4B4A4_USCALED = 4,
-    VK_FORMAT_R5G6B5_UNORM = 5,
+    VK_FORMAT_R5G6B5_UNORM_PACK16 = 5,
     VK_FORMAT_R5G6B5_USCALED = 6,
-    VK_FORMAT_R5G5B5A1_UNORM = 7,
+    VK_FORMAT_R5G5B5A1_UNORM_PACK16 = 7,
     VK_FORMAT_R5G5B5A1_USCALED = 8,
     VK_FORMAT_R8_UNORM = 9,
     VK_FORMAT_R8_SNORM = 10,
@@ -357,9 +357,9 @@ typedef enum VkFormat {
     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,
+    VK_FORMAT_B4G4R4A4_UNORM_PACK16 = 150,
+    VK_FORMAT_B5G5R5A1_UNORM_PACK16 = 151,
+    VK_FORMAT_B5G6R5_UNORM_PACK16 = 152,
     VK_FORMAT_B5G6R5_USCALED = 153,
     VK_FORMAT_B8G8R8_UNORM = 154,
     VK_FORMAT_B8G8R8_SNORM = 155,
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index a85d0f99..8a6ea48c 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -38,13 +38,13 @@ typedef struct _VULKAN_FORMAT_INFO {
 // for each Vulkan format.
 static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 0,  0 }, //    [VK_FORMAT_UNDEFINED]
-    { 1,  2 }, //    [VK_FORMAT_R4G4_UNORM]
+    { 1,  2 }, //    [VK_FORMAT_R4G4_UNORM_PACK8]
     { 1,  2 }, //    [VK_FORMAT_R4G4_USCALED]
-    { 2,  4 }, //    [VK_FORMAT_R4G4B4A4_UNORM]
+    { 2,  4 }, //    [VK_FORMAT_R4G4B4A4_UNORM_PACK16]
     { 2,  4 }, //    [VK_FORMAT_R4G4B4A4_USCALED]
-    { 2,  3 }, //    [VK_FORMAT_R5G6B5_UNORM]
+    { 2,  3 }, //    [VK_FORMAT_R5G6B5_UNORM_PACK16]
     { 2,  3 }, //    [VK_FORMAT_R5G6B5_USCALED]
-    { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_UNORM]
+    { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]
     { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_USCALED]
     { 1,  1 }, //    [VK_FORMAT_R8_UNORM]
     { 1,  1 }, //    [VK_FORMAT_R8_SNORM]
@@ -187,7 +187,7 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 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_UNORM_PACK16]
     { 2, 3 },  //    [VK_FORMAT_B5G6R5_USCALED]
     { 3, 3 },  //    [VK_FORMAT_B8G8R8_UNORM]
     { 3, 3 },  //    [VK_FORMAT_B8G8R8_SNORM]
@@ -266,10 +266,10 @@ bool vk_format_is_norm(VkFormat format)
     bool is_norm = false;
 
     switch (format) {
-    case VK_FORMAT_R4G4_UNORM:
-    case VK_FORMAT_R4G4B4A4_UNORM:
-    case VK_FORMAT_R5G6B5_UNORM:
-    case VK_FORMAT_R5G5B5A1_UNORM:
+    case VK_FORMAT_R4G4_UNORM_PACK8:
+    case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
+    case VK_FORMAT_R5G6B5_UNORM_PACK16:
+    case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
     case VK_FORMAT_R8_UNORM:
     case VK_FORMAT_R8_SNORM:
     case VK_FORMAT_R8G8_UNORM:
@@ -317,7 +317,7 @@ bool vk_format_is_norm(VkFormat format)
     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_B5G6R5_UNORM_PACK16:
     case VK_FORMAT_B8G8R8_UNORM:
     case VK_FORMAT_B8G8R8_SNORM:
     case VK_FORMAT_B8G8R8A8_UNORM: