commit 935f2edf49eaf0b14e247fc7044d6e357c7940ec
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:42 2015 -0700
tree f07be84b405940002b0b033d5536f830d06a3e79
parent 53638c10acea36c69019e36a416bd2dd203ee5e8

bug 12998 part 2: append _PACK* to packed formats that change conventions

s/VK_FORMAT_R11G11B10_UFLOAT\b/VK_FORMAT_B10G11R11_UFLOAT_PACK32/g
s/VK_FORMAT_R9G9B9E5_UFLOAT\b/VK_FORMAT_E5B9G9R9_UFLOAT_PACK32/g
s/VK_FORMAT_D24_UNORM_X8\b/VK_FORMAT_X8_D24_UNORM_PACK32/g
s/VK_FORMAT_R10G10B10A2_UNORM\b/VK_FORMAT_A2B10G10R10_UNORM_PACK32/g
s/VK_FORMAT_R10G10B10A2_SNORM\b/VK_FORMAT_A2B10G10R10_SNORM_PACK32/g
s/VK_FORMAT_R10G10B10A2_USCALED\b/VK_FORMAT_A2B10G10R10_USCALED_PACK32/g
s/VK_FORMAT_R10G10B10A2_SSCALED\b/VK_FORMAT_A2B10G10R10_SSCALED_PACK32/g
s/VK_FORMAT_R10G10B10A2_UINT\b/VK_FORMAT_A2B10G10R10_UINT_PACK32/g
s/VK_FORMAT_R10G10B10A2_SINT\b/VK_FORMAT_A2B10G10R10_SINT_PACK32/g
s/VK_FORMAT_B10G10R10A2_UNORM\b/VK_FORMAT_A2R10G10B10_UNORM_PACK32/g
s/VK_FORMAT_B10G10R10A2_SNORM\b/VK_FORMAT_A2R10G10B10_SNORM_PACK32/g
s/VK_FORMAT_B10G10R10A2_USCALED\b/VK_FORMAT_A2R10G10B10_USCALED_PACK32/g
s/VK_FORMAT_B10G10R10A2_SSCALED\b/VK_FORMAT_A2R10G10B10_SSCALED_PACK32/g
s/VK_FORMAT_B10G10R10A2_UINT\b/VK_FORMAT_A2R10G10B10_UINT_PACK32/g
s/VK_FORMAT_B10G10R10A2_SINT\b/VK_FORMAT_A2R10G10B10_SINT_PACK32/g
s/STR(R11G11B10_UFLOAT\b/STR(B10G11R11_UFLOAT_PACK32/g
s/STR(R9G9B9E5_UFLOAT\b/STR(E5B9G9R9_UFLOAT_PACK32/g
s/STR(D24_UNORM_X8\b/STR(X8_D24_UNORM_PACK32/g
s/STR(R10G10B10A2_UNORM\b/STR(A2B10G10R10_UNORM_PACK32/g
s/STR(R10G10B10A2_SNORM\b/STR(A2B10G10R10_SNORM_PACK32/g
s/STR(R10G10B10A2_USCALED\b/STR(A2B10G10R10_USCALED_PACK32/g
s/STR(R10G10B10A2_SSCALED\b/STR(A2B10G10R10_SSCALED_PACK32/g
s/STR(R10G10B10A2_UINT\b/STR(A2B10G10R10_UINT_PACK32/g
s/STR(R10G10B10A2_SINT\b/STR(A2B10G10R10_SINT_PACK32/g
s/STR(B10G10R10A2_UNORM\b/STR(A2R10G10B10_UNORM_PACK32/g
s/STR(B10G10R10A2_SNORM\b/STR(A2R10G10B10_SNORM_PACK32/g
s/STR(B10G10R10A2_USCALED\b/STR(A2R10G10B10_USCALED_PACK32/g
s/STR(B10G10R10A2_SSCALED\b/STR(A2R10G10B10_SSCALED_PACK32/g
s/STR(B10G10R10A2_UINT\b/STR(A2R10G10B10_UINT_PACK32/g
s/STR(B10G10R10A2_SINT\b/STR(A2R10G10B10_SINT_PACK32/g

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index f873833..2b4b4ba 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -346,12 +346,12 @@
         { VK_FORMAT_R8G8B8A8_UINT,         4,  4 },
         { VK_FORMAT_R8G8B8A8_SINT,         4,  4 },
         { VK_FORMAT_R8G8B8A8_SRGB,         4,  4 },
-        { VK_FORMAT_R10G10B10A2_UNORM,     4,  4 },
-        { VK_FORMAT_R10G10B10A2_SNORM,     4,  4 },
-        { VK_FORMAT_R10G10B10A2_USCALED,   4,  4 },
-        { VK_FORMAT_R10G10B10A2_SSCALED,   4,  4 },
-        { VK_FORMAT_R10G10B10A2_UINT,      4,  4 },
-        { VK_FORMAT_R10G10B10A2_SINT,      4,  4 },
+        { VK_FORMAT_A2B10G10R10_UNORM_PACK32,     4,  4 },
+        { VK_FORMAT_A2B10G10R10_SNORM_PACK32,     4,  4 },
+        { VK_FORMAT_A2B10G10R10_USCALED_PACK32,   4,  4 },
+        { VK_FORMAT_A2B10G10R10_SSCALED_PACK32,   4,  4 },
+        { VK_FORMAT_A2B10G10R10_UINT_PACK32,      4,  4 },
+        { VK_FORMAT_A2B10G10R10_SINT_PACK32,      4,  4 },
         { VK_FORMAT_R16_UNORM,             2,  1 },
         { VK_FORMAT_R16_SNORM,             2,  1 },
         { VK_FORMAT_R16_USCALED,           2,  1 },
@@ -396,10 +396,10 @@
         { VK_FORMAT_R64G64_SFLOAT,         16, 2 },
         { VK_FORMAT_R64G64B64_SFLOAT,      24, 3 },
         { VK_FORMAT_R64G64B64A64_SFLOAT,   32, 4 },
-        { VK_FORMAT_R11G11B10_UFLOAT,      4,  3 },
-        { VK_FORMAT_R9G9B9E5_UFLOAT,       4,  3 },
+        { VK_FORMAT_B10G11R11_UFLOAT_PACK32,      4,  3 },
+        { VK_FORMAT_E5B9G9R9_UFLOAT_PACK32,       4,  3 },
         { VK_FORMAT_D16_UNORM,             2,  1 },
-        { VK_FORMAT_D24_UNORM_X8,          3,  1 },
+        { VK_FORMAT_X8_D24_UNORM_PACK32,          3,  1 },
         { VK_FORMAT_D32_SFLOAT,            4,  1 },
         { VK_FORMAT_S8_UINT,               1,  1 },
         { VK_FORMAT_D16_UNORM_S8_UINT,     3,  2 },
@@ -478,12 +478,12 @@
         { VK_FORMAT_B8G8R8A8_UINT,         4, 4 },
         { VK_FORMAT_B8G8R8A8_SINT,         4, 4 },
         { VK_FORMAT_B8G8R8A8_SRGB,         4, 4 },
-        { VK_FORMAT_B10G10R10A2_UNORM,     4, 4 },
-        { VK_FORMAT_B10G10R10A2_SNORM,     4, 4 },
-        { VK_FORMAT_B10G10R10A2_USCALED,   4, 4 },
-        { VK_FORMAT_B10G10R10A2_SSCALED,   4, 4 },
-        { VK_FORMAT_B10G10R10A2_UINT,      4, 4 },
-        { VK_FORMAT_B10G10R10A2_SINT,      4, 4 },
+        { VK_FORMAT_A2R10G10B10_UNORM_PACK32,     4, 4 },
+        { VK_FORMAT_A2R10G10B10_SNORM_PACK32,     4, 4 },
+        { VK_FORMAT_A2R10G10B10_USCALED_PACK32,   4, 4 },
+        { VK_FORMAT_A2R10G10B10_SSCALED_PACK32,   4, 4 },
+        { VK_FORMAT_A2R10G10B10_UINT_PACK32,      4, 4 },
+        { VK_FORMAT_A2R10G10B10_SINT_PACK32,      4, 4 },
     };
     if (format_table_unverified)
     {
@@ -1469,7 +1469,7 @@
 
         // known driver issues
         if (it->format == VK_FORMAT_S8_UINT ||
-            it->format == VK_FORMAT_D24_UNORM_X8 ||
+            it->format == VK_FORMAT_X8_D24_UNORM_PACK32 ||
             it->format == VK_FORMAT_D16_UNORM_S8_UINT ||
             it->format == VK_FORMAT_D24_UNORM_S8_UINT)
             continue;