commit 08bee5efe1dd094546d2691c00a6e78dadb23890
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:51 2015 -0700
tree ae5193afa2487b3dc2f315a9aee8ef10b9b244ba
parent f40bbfb666c3d122c1caee818bec41f25ad036fb

bug 12998 part 5: reorder formats

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index db2ed90..c467821 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -314,10 +314,14 @@
         { VK_FORMAT_R4G4_USCALED,          1,  2 },
         { VK_FORMAT_R4G4B4A4_UNORM_PACK16,        2,  4 },
         { VK_FORMAT_R4G4B4A4_USCALED,      2,  4 },
+        { VK_FORMAT_B4G4R4A4_UNORM_PACK16,        2, 4 },
         { VK_FORMAT_R5G6B5_UNORM_PACK16,          2,  3 },
         { VK_FORMAT_R5G6B5_USCALED,        2,  3 },
+        { VK_FORMAT_B5G6R5_UNORM_PACK16,          2, 3 },
+        { VK_FORMAT_B5G6R5_USCALED,        2, 3 },
         { VK_FORMAT_R5G5B5A1_UNORM_PACK16,        2,  4 },
         { VK_FORMAT_R5G5B5A1_USCALED,      2,  4 },
+        { VK_FORMAT_B5G5R5A1_UNORM_PACK16,        2, 4 },
         { VK_FORMAT_R8_UNORM,              1,  1 },
         { VK_FORMAT_R8_SNORM,              1,  1 },
         { VK_FORMAT_R8_USCALED,            1,  1 },
@@ -339,6 +343,13 @@
         { VK_FORMAT_R8G8B8_UINT,           3,  3 },
         { VK_FORMAT_R8G8B8_SINT,           3,  3 },
         { VK_FORMAT_R8G8B8_SRGB,           3,  3 },
+        { VK_FORMAT_B8G8R8_UNORM,          3, 3 },
+        { VK_FORMAT_B8G8R8_SNORM,          3, 3 },
+        { VK_FORMAT_B8G8R8_USCALED,        3, 3 },
+        { VK_FORMAT_B8G8R8_SSCALED,        3, 3 },
+        { VK_FORMAT_B8G8R8_UINT,           3, 3 },
+        { VK_FORMAT_B8G8R8_SINT,           3, 3 },
+        { VK_FORMAT_B8G8R8_SRGB,           3, 3 },
         { VK_FORMAT_R8G8B8A8_UNORM,        4,  4 },
         { VK_FORMAT_R8G8B8A8_SNORM,        4,  4 },
         { VK_FORMAT_R8G8B8A8_USCALED,      4,  4 },
@@ -346,6 +357,19 @@
         { VK_FORMAT_R8G8B8A8_UINT,         4,  4 },
         { VK_FORMAT_R8G8B8A8_SINT,         4,  4 },
         { VK_FORMAT_R8G8B8A8_SRGB,         4,  4 },
+        { VK_FORMAT_B8G8R8A8_UNORM,        4, 4 },
+        { VK_FORMAT_B8G8R8A8_SNORM,        4, 4 },
+        { VK_FORMAT_B8G8R8A8_USCALED,      4, 4 },
+        { VK_FORMAT_B8G8R8A8_SSCALED,      4, 4 },
+        { VK_FORMAT_B8G8R8A8_UINT,         4, 4 },
+        { VK_FORMAT_B8G8R8A8_SINT,         4, 4 },
+        { VK_FORMAT_B8G8R8A8_SRGB,         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 },
         { VK_FORMAT_A2B10G10R10_UNORM_PACK32,     4,  4 },
         { VK_FORMAT_A2B10G10R10_SNORM_PACK32,     4,  4 },
         { VK_FORMAT_A2B10G10R10_USCALED_PACK32,   4,  4 },
@@ -460,30 +484,6 @@
         { 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_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 },
-        { VK_FORMAT_B8G8R8_USCALED,        3, 3 },
-        { VK_FORMAT_B8G8R8_SSCALED,        3, 3 },
-        { VK_FORMAT_B8G8R8_UINT,           3, 3 },
-        { VK_FORMAT_B8G8R8_SINT,           3, 3 },
-        { VK_FORMAT_B8G8R8_SRGB,           3, 3 },
-        { VK_FORMAT_B8G8R8A8_UNORM,        4, 4 },
-        { VK_FORMAT_B8G8R8A8_SNORM,        4, 4 },
-        { VK_FORMAT_B8G8R8A8_USCALED,      4, 4 },
-        { VK_FORMAT_B8G8R8A8_SSCALED,      4, 4 },
-        { VK_FORMAT_B8G8R8A8_UINT,         4, 4 },
-        { VK_FORMAT_B8G8R8A8_SINT,         4, 4 },
-        { VK_FORMAT_B8G8R8A8_SRGB,         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)
     {