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

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 2b4b4ba..db2ed90 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -310,13 +310,13 @@
         uint32_t channel_count;
     } 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 },
@@ -460,9 +460,9 @@
         { 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 },
+        { VK_FORMAT_B4G4R4A4_UNORM_PACK16,        2, 4 },
+        { VK_FORMAT_B5G5R5A1_UNORM_PACK16,        2, 4 },
+        { 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 },