commit caa5aaa0fa86fbff23f6e58c89d3b7542c0d5ab2
author Chia-I Wu <olv@lunarg.com> Tue Nov 10 17:01:22 2015 +0800
committer Jon Ashburn <jon@lunarg.com> Wed Nov 11 08:58:45 2015 -0700
tree 3930de69c8bb626a6cdf6cf3923e14bf90f096cb
parent 935f2edf49eaf0b14e247fc7044d6e357c7940ec

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

layers/vk_layer_utils.cpp

diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index a85d0f9..8a6ea48 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -38,13 +38,13 @@
 // 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 @@
     { 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 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 @@
     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: