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:45 -0700 |
| commit | 2f8d01a06448f72470ae00e085de11d27dd2b962 (patch) | |
| tree | 9d2451c3dda493eb1826ba83f5030a03d1442aba /include/vulkan | |
| parent | c8fd8d0cb88ed6eb8b3446aad46d15bbfc9eb548 (diff) | |
| download | usermoji-2f8d01a06448f72470ae00e085de11d27dd2b962.tar.xz | |
bug 12998 part 3: append _PACK* to remaining packed formats
s/VK_FORMAT_R4G4_UNORM\b/VK_FORMAT_R4G4_UNORM_PACK8/g
s/VK_FORMAT_B4G4R4A4_UNORM\b/VK_FORMAT_B4G4R4A4_UNORM_PACK16/g
s/VK_FORMAT_B5G6R5_UNORM\b/VK_FORMAT_B5G6R5_UNORM_PACK16/g
s/VK_FORMAT_R5G6B5_UNORM\b/VK_FORMAT_R5G6B5_UNORM_PACK16/g
s/VK_FORMAT_B5G5R5A1_UNORM\b/VK_FORMAT_B5G5R5A1_UNORM_PACK16/g
s/VK_FORMAT_R5G5B5A1_UNORM\b/VK_FORMAT_R5G5B5A1_UNORM_PACK16/g
s/STR(R4G4_UNORM\b/STR(R4G4_UNORM_PACK8/g
s/STR(B4G4R4A4_UNORM\b/STR(B4G4R4A4_UNORM_PACK16/g
s/STR(B5G6R5_UNORM\b/STR(B5G6R5_UNORM_PACK16/g
s/STR(R5G6B5_UNORM\b/STR(R5G6B5_UNORM_PACK16/g
s/STR(B5G5R5A1_UNORM\b/STR(B5G5R5A1_UNORM_PACK16/g
s/STR(R5G5B5A1_UNORM\b/STR(R5G5B5A1_UNORM_PACK16/g
s/VK_FORMAT_R4G4B4A4_UNORM/VK_FORMAT_R4G4B4A4_UNORM_PACK16/g
s/STR(R4G4B4A4_UNORM/STR(R4G4B4A4_UNORM_PACK16/g
Diffstat (limited to 'include/vulkan')
| -rw-r--r-- | include/vulkan/vulkan.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 2087b518..6580697e 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -208,13 +208,13 @@ typedef enum VkInternalAllocationType { typedef enum VkFormat { VK_FORMAT_UNDEFINED = 0, - VK_FORMAT_R4G4_UNORM = 1, + VK_FORMAT_R4G4_UNORM_PACK8 = 1, VK_FORMAT_R4G4_USCALED = 2, - VK_FORMAT_R4G4B4A4_UNORM = 3, + VK_FORMAT_R4G4B4A4_UNORM_PACK16 = 3, VK_FORMAT_R4G4B4A4_USCALED = 4, - VK_FORMAT_R5G6B5_UNORM = 5, + VK_FORMAT_R5G6B5_UNORM_PACK16 = 5, VK_FORMAT_R5G6B5_USCALED = 6, - VK_FORMAT_R5G5B5A1_UNORM = 7, + VK_FORMAT_R5G5B5A1_UNORM_PACK16 = 7, VK_FORMAT_R5G5B5A1_USCALED = 8, VK_FORMAT_R8_UNORM = 9, VK_FORMAT_R8_SNORM = 10, @@ -357,9 +357,9 @@ typedef enum VkFormat { VK_FORMAT_ASTC_12x10_SRGB_BLOCK = 147, VK_FORMAT_ASTC_12x12_UNORM_BLOCK = 148, VK_FORMAT_ASTC_12x12_SRGB_BLOCK = 149, - VK_FORMAT_B4G4R4A4_UNORM = 150, - VK_FORMAT_B5G5R5A1_UNORM = 151, - VK_FORMAT_B5G6R5_UNORM = 152, + VK_FORMAT_B4G4R4A4_UNORM_PACK16 = 150, + VK_FORMAT_B5G5R5A1_UNORM_PACK16 = 151, + VK_FORMAT_B5G6R5_UNORM_PACK16 = 152, VK_FORMAT_B5G6R5_USCALED = 153, VK_FORMAT_B8G8R8_UNORM = 154, VK_FORMAT_B8G8R8_SNORM = 155, |