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

3 files changed, 31 insertions, 31 deletions

diff --git a/layers/image.cpp b/layers/image.cpp
index 4c08a833..d97d77bc 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -241,7 +241,7 @@ bool is_depth_format(VkFormat format)
     bool result = VK_FALSE;
     switch (format) {
         case VK_FORMAT_D16_UNORM:
-        case VK_FORMAT_D24_UNORM_X8:
+        case VK_FORMAT_X8_D24_UNORM_PACK32:
         case VK_FORMAT_D32_SFLOAT:
         case VK_FORMAT_S8_UINT:
         case VK_FORMAT_D16_UNORM_S8_UINT:
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 260a275a..c3c68e09 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -736,8 +736,8 @@ get_format_type(VkFormat fmt) {
     case VK_FORMAT_R32G32B32A32_SINT:
     case VK_FORMAT_B8G8R8_SINT:
     case VK_FORMAT_B8G8R8A8_SINT:
-    case VK_FORMAT_R10G10B10A2_SINT:
-    case VK_FORMAT_B10G10R10A2_SINT:
+    case VK_FORMAT_A2B10G10R10_SINT_PACK32:
+    case VK_FORMAT_A2R10G10B10_SINT_PACK32:
         return FORMAT_TYPE_SINT;
     case VK_FORMAT_R8_UINT:
     case VK_FORMAT_R8G8_UINT:
@@ -753,8 +753,8 @@ get_format_type(VkFormat fmt) {
     case VK_FORMAT_R32G32B32A32_UINT:
     case VK_FORMAT_B8G8R8_UINT:
     case VK_FORMAT_B8G8R8A8_UINT:
-    case VK_FORMAT_R10G10B10A2_UINT:
-    case VK_FORMAT_B10G10R10A2_UINT:
+    case VK_FORMAT_A2B10G10R10_UINT_PACK32:
+    case VK_FORMAT_A2R10G10B10_UINT_PACK32:
         return FORMAT_TYPE_UINT;
     default:
         return FORMAT_TYPE_FLOAT;
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 377cbbfd..a85d0f99 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -74,12 +74,12 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 4,  4 }, //    [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]
     { 2,  1 }, //    [VK_FORMAT_R16_UNORM]
     { 2,  1 }, //    [VK_FORMAT_R16_SNORM]
     { 2,  1 }, //    [VK_FORMAT_R16_USCALED]
@@ -124,10 +124,10 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 16, 2 }, //    [VK_FORMAT_R64G64_SFLOAT]
     { 24, 3 }, //    [VK_FORMAT_R64G64B64_SFLOAT]
     { 32, 4 }, //    [VK_FORMAT_R64G64B64A64_SFLOAT]
-    { 4,  3 }, //    [VK_FORMAT_R11G11B10_UFLOAT]
-    { 4,  3 }, //    [VK_FORMAT_R9G9B9E5_UFLOAT]
+    { 4,  3 }, //    [VK_FORMAT_B10G11R11_UFLOAT_PACK32]
+    { 4,  3 }, //    [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32]
     { 2,  1 }, //    [VK_FORMAT_D16_UNORM]
-    { 3,  1 }, //    [VK_FORMAT_D24_UNORM_X8]
+    { 3,  1 }, //    [VK_FORMAT_X8_D24_UNORM_PACK32]
     { 4,  1 }, //    [VK_FORMAT_D32_SFLOAT]
     { 1,  1 }, //    [VK_FORMAT_S8_UINT]
     { 3,  2 }, //    [VK_FORMAT_D16_UNORM_S8_UINT]
@@ -203,12 +203,12 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 4, 4 },  //    [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]
 };
 
 // Return true if format is a depth or stencil format
@@ -249,7 +249,7 @@ bool vk_format_is_depth_only(VkFormat format)
 
     switch (format) {
     case VK_FORMAT_D16_UNORM:
-    case VK_FORMAT_D24_UNORM_X8:
+    case VK_FORMAT_X8_D24_UNORM_PACK32:
     case VK_FORMAT_D32_SFLOAT:
         is_depth = true;
         break;
@@ -278,8 +278,8 @@ bool vk_format_is_norm(VkFormat format)
     case VK_FORMAT_R8G8B8_SNORM:
     case VK_FORMAT_R8G8B8A8_UNORM:
     case VK_FORMAT_R8G8B8A8_SNORM:
-    case VK_FORMAT_R10G10B10A2_UNORM:
-    case VK_FORMAT_R10G10B10A2_SNORM:
+    case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
+    case VK_FORMAT_A2B10G10R10_SNORM_PACK32:
     case VK_FORMAT_R16_UNORM:
     case VK_FORMAT_R16_SNORM:
     case VK_FORMAT_R16G16_UNORM:
@@ -322,8 +322,8 @@ bool vk_format_is_norm(VkFormat format)
     case VK_FORMAT_B8G8R8_SNORM:
     case VK_FORMAT_B8G8R8A8_UNORM:
     case VK_FORMAT_B8G8R8A8_SNORM:
-    case VK_FORMAT_B10G10R10A2_UNORM:
-    case VK_FORMAT_B10G10R10A2_SNORM:
+    case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
+    case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
         is_norm = true;
         break;
     default:
@@ -350,7 +350,7 @@ bool vk_format_is_uint(VkFormat format)
     case VK_FORMAT_R8G8_UINT:
     case VK_FORMAT_R8G8B8_UINT:
     case VK_FORMAT_R8G8B8A8_UINT:
-    case VK_FORMAT_R10G10B10A2_UINT:
+    case VK_FORMAT_A2B10G10R10_UINT_PACK32:
     case VK_FORMAT_R16_UINT:
     case VK_FORMAT_R16G16_UINT:
     case VK_FORMAT_R16G16B16_UINT:
@@ -361,7 +361,7 @@ bool vk_format_is_uint(VkFormat format)
     case VK_FORMAT_R32G32B32A32_UINT:
     case VK_FORMAT_B8G8R8_UINT:
     case VK_FORMAT_B8G8R8A8_UINT:
-    case VK_FORMAT_B10G10R10A2_UINT:
+    case VK_FORMAT_A2R10G10B10_UINT_PACK32:
         is_uint = true;
         break;
     default:
@@ -381,7 +381,7 @@ bool vk_format_is_sint(VkFormat format)
     case VK_FORMAT_R8G8_SINT:
     case VK_FORMAT_R8G8B8_SINT:
     case VK_FORMAT_R8G8B8A8_SINT:
-    case VK_FORMAT_R10G10B10A2_SINT:
+    case VK_FORMAT_A2B10G10R10_SINT_PACK32:
     case VK_FORMAT_R16_SINT:
     case VK_FORMAT_R16G16_SINT:
     case VK_FORMAT_R16G16B16_SINT:
@@ -392,7 +392,7 @@ bool vk_format_is_sint(VkFormat format)
     case VK_FORMAT_R32G32B32A32_SINT:
     case VK_FORMAT_B8G8R8_SINT:
     case VK_FORMAT_B8G8R8A8_SINT:
-    case VK_FORMAT_B10G10R10A2_SINT:
+    case VK_FORMAT_A2R10G10B10_SINT_PACK32:
         is_sint = true;
         break;
     default:
@@ -420,8 +420,8 @@ bool vk_format_is_float(VkFormat format)
     case VK_FORMAT_R64G64_SFLOAT:
     case VK_FORMAT_R64G64B64_SFLOAT:
     case VK_FORMAT_R64G64B64A64_SFLOAT:
-    case VK_FORMAT_R11G11B10_UFLOAT:
-    case VK_FORMAT_R9G9B9E5_UFLOAT:
+    case VK_FORMAT_B10G11R11_UFLOAT_PACK32:
+    case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32:
     case VK_FORMAT_BC6H_UFLOAT_BLOCK:
     case VK_FORMAT_BC6H_SFLOAT_BLOCK:
         is_float = true;