diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-11-10 17:01:22 +0800 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-11-11 08:58:51 -0700 |
| commit | 25529051fa2f996361f5c9a31e1ea1640a7d1525 (patch) | |
| tree | fdb84bcaea0e249d2bb2be245451d77f69497918 /layers/vk_layer_utils.cpp | |
| parent | a49de175191ddbe218a558a13803236ef34adf48 (diff) | |
| download | usermoji-25529051fa2f996361f5c9a31e1ea1640a7d1525.tar.xz | |
bug 12998 part 5: reorder formats
Diffstat (limited to 'layers/vk_layer_utils.cpp')
| -rw-r--r-- | layers/vk_layer_utils.cpp | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp index 8a6ea48c..f105988d 100644 --- a/layers/vk_layer_utils.cpp +++ b/layers/vk_layer_utils.cpp @@ -42,10 +42,14 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = { { 1, 2 }, // [VK_FORMAT_R4G4_USCALED] { 2, 4 }, // [VK_FORMAT_R4G4B4A4_UNORM_PACK16] { 2, 4 }, // [VK_FORMAT_R4G4B4A4_USCALED] + { 2, 4 }, // [VK_FORMAT_B4G4R4A4_UNORM_PACK16] { 2, 3 }, // [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, 4 }, // [VK_FORMAT_R5G5B5A1_UNORM_PACK16] { 2, 4 }, // [VK_FORMAT_R5G5B5A1_USCALED] + { 2, 4 }, // [VK_FORMAT_B5G5R5A1_UNORM_PACK16] { 1, 1 }, // [VK_FORMAT_R8_UNORM] { 1, 1 }, // [VK_FORMAT_R8_SNORM] { 1, 1 }, // [VK_FORMAT_R8_USCALED] @@ -67,6 +71,13 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = { { 3, 3 }, // [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] { 4, 4 }, // [VK_FORMAT_R8G8B8A8_UNORM] { 4, 4 }, // [VK_FORMAT_R8G8B8A8_SNORM] { 4, 4 }, // [VK_FORMAT_R8G8B8A8_USCALED] @@ -74,6 +85,19 @@ 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_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] @@ -187,28 +211,6 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = { { 16, 4 }, // [VK_FORMAT_ASTC_12x10_SRGB_BLOCK] { 16, 4 }, // [VK_FORMAT_ASTC_12x12_UNORM_BLOCK] { 16, 4 }, // [VK_FORMAT_ASTC_12x12_SRGB_BLOCK] - { 2, 3 }, // [VK_FORMAT_B5G6R5_UNORM_PACK16] - { 2, 3 }, // [VK_FORMAT_B5G6R5_USCALED] - { 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] - { 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] }; // Return true if format is a depth or stencil format |