bug 12998 part 8: add new formats

1 files changed, 30 insertions, 0 deletions

diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 33226a1f..a96c97e6 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -45,6 +45,7 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 2,  3 }, //    [VK_FORMAT_B5G6R5_UNORM_PACK16]
     { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]
     { 2,  4 }, //    [VK_FORMAT_B5G5R5A1_UNORM_PACK16]
+    { 2,  4 }, //    [VK_FORMAT_A1R5G5B5_UNORM_PACK16]
     { 1,  1 }, //    [VK_FORMAT_R8_UNORM]
     { 1,  1 }, //    [VK_FORMAT_R8_SNORM]
     { 1,  1 }, //    [VK_FORMAT_R8_USCALED]
@@ -87,6 +88,13 @@ 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_A8B8G8R8_UNORM_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_A8B8G8R8_SNORM_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_A8B8G8R8_USCALED_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_A8B8G8R8_SSCALED_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_A8B8G8R8_UINT_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_A8B8G8R8_SINT_PACK32]
+    { 4,  4 }, //    [VK_FORMAT_B8G8R8A8_SRGB_PACK32]
     { 4,  4 }, //    [VK_FORMAT_A2R10G10B10_UNORM_PACK32]
     { 4,  4 }, //    [VK_FORMAT_A2R10G10B10_SNORM_PACK32]
     { 4,  4 }, //    [VK_FORMAT_A2R10G10B10_USCALED_PACK32]
@@ -139,9 +147,17 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 16, 4 }, //    [VK_FORMAT_R32G32B32A32_UINT]
     { 16, 4 }, //    [VK_FORMAT_R32G32B32A32_SINT]
     { 16, 4 }, //    [VK_FORMAT_R32G32B32A32_SFLOAT]
+    { 8,  1 }, //    [VK_FORMAT_R64_UINT]
+    { 8,  1 }, //    [VK_FORMAT_R64_SINT]
     { 8,  1 }, //    [VK_FORMAT_R64_SFLOAT]
+    { 16, 2 }, //    [VK_FORMAT_R64G64_UINT]
+    { 16, 2 }, //    [VK_FORMAT_R64G64_SINT]
     { 16, 2 }, //    [VK_FORMAT_R64G64_SFLOAT]
+    { 24, 3 }, //    [VK_FORMAT_R64G64B64_UINT]
+    { 24, 3 }, //    [VK_FORMAT_R64G64B64_SINT]
     { 24, 3 }, //    [VK_FORMAT_R64G64B64_SFLOAT]
+    { 32, 4 }, //    [VK_FORMAT_R64G64B64A64_UINT]
+    { 32, 4 }, //    [VK_FORMAT_R64G64B64A64_SINT]
     { 32, 4 }, //    [VK_FORMAT_R64G64B64A64_SFLOAT]
     { 4,  3 }, //    [VK_FORMAT_B10G11R11_UFLOAT_PACK32]
     { 4,  3 }, //    [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32]
@@ -267,6 +283,7 @@ bool vk_format_is_norm(VkFormat format)
     case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
     case VK_FORMAT_R5G6B5_UNORM_PACK16:
     case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
+    case VK_FORMAT_A1R5G5B5_UNORM_PACK16:
     case VK_FORMAT_R8_UNORM:
     case VK_FORMAT_R8_SNORM:
     case VK_FORMAT_R8G8_UNORM:
@@ -275,6 +292,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_A8B8G8R8_UNORM_PACK32:
+    case VK_FORMAT_A8B8G8R8_SNORM_PACK32:
     case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
     case VK_FORMAT_A2B10G10R10_SNORM_PACK32:
     case VK_FORMAT_R16_UNORM:
@@ -347,6 +366,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_A8B8G8R8_UINT_PACK32:
     case VK_FORMAT_A2B10G10R10_UINT_PACK32:
     case VK_FORMAT_R16_UINT:
     case VK_FORMAT_R16G16_UINT:
@@ -356,6 +376,10 @@ bool vk_format_is_uint(VkFormat format)
     case VK_FORMAT_R32G32_UINT:
     case VK_FORMAT_R32G32B32_UINT:
     case VK_FORMAT_R32G32B32A32_UINT:
+    case VK_FORMAT_R64_UINT:
+    case VK_FORMAT_R64G64_UINT:
+    case VK_FORMAT_R64G64B64_UINT:
+    case VK_FORMAT_R64G64B64A64_UINT:
     case VK_FORMAT_B8G8R8_UINT:
     case VK_FORMAT_B8G8R8A8_UINT:
     case VK_FORMAT_A2R10G10B10_UINT_PACK32:
@@ -378,6 +402,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_A8B8G8R8_SINT_PACK32:
     case VK_FORMAT_A2B10G10R10_SINT_PACK32:
     case VK_FORMAT_R16_SINT:
     case VK_FORMAT_R16G16_SINT:
@@ -387,6 +412,10 @@ bool vk_format_is_sint(VkFormat format)
     case VK_FORMAT_R32G32_SINT:
     case VK_FORMAT_R32G32B32_SINT:
     case VK_FORMAT_R32G32B32A32_SINT:
+    case VK_FORMAT_R64_SINT:
+    case VK_FORMAT_R64G64_SINT:
+    case VK_FORMAT_R64G64B64_SINT:
+    case VK_FORMAT_R64G64B64A64_SINT:
     case VK_FORMAT_B8G8R8_SINT:
     case VK_FORMAT_B8G8R8A8_SINT:
     case VK_FORMAT_A2R10G10B10_SINT_PACK32:
@@ -440,6 +469,7 @@ bool vk_format_is_srgb(VkFormat format)
     case VK_FORMAT_R8G8_SRGB:
     case VK_FORMAT_R8G8B8_SRGB:
     case VK_FORMAT_R8G8B8A8_SRGB:
+    case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
     case VK_FORMAT_BC1_RGB_SRGB_BLOCK:
     case VK_FORMAT_BC2_SRGB_BLOCK:
     case VK_FORMAT_BC3_SRGB_BLOCK: