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:54 -0700 |
| commit | 3684713f21c8ca86a583987403c71e2239d68dca (patch) | |
| tree | 5a455b82503f14f1206e9d51f3fadf8bda7b4ac4 | |
| parent | 25529051fa2f996361f5c9a31e1ea1640a7d1525 (diff) | |
| download | usermoji-3684713f21c8ca86a583987403c71e2239d68dca.tar.xz | |
bug 12998 part 6: add missing formats to icd and demos
| -rw-r--r-- | demos/vulkaninfo.c | 2 | ||||
| -rw-r--r-- | icd/common/icd-format.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 69f50814..d49853a3 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -174,12 +174,14 @@ static const char *vk_format_string(VkFormat fmt) STR(R4G4_USCALED); STR(R4G4B4A4_UNORM_PACK16); STR(R4G4B4A4_USCALED); + STR(B4G4R4A4_UNORM_PACK16); STR(R5G6B5_UNORM_PACK16); STR(R5G6B5_USCALED); STR(B5G6R5_UNORM_PACK16); STR(B5G6R5_USCALED); STR(R5G5B5A1_UNORM_PACK16); STR(R5G5B5A1_USCALED); + STR(B5G5R5A1_UNORM_PACK16); STR(R8_UNORM); STR(R8_SNORM); STR(R8_USCALED); diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index 9529780b..210ad62b 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -40,12 +40,14 @@ static const struct icd_format_info { [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 }, |