From da4e391231ed6abf5145446b63306f1641fb41aa Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 10 Nov 2015 16:44:23 +0800 Subject: bug 12998 part 1: append _BLOCK to compressed formats s/VK_FORMAT_BC1_RGB_UNORM\b/VK_FORMAT_BC1_RGB_UNORM_BLOCK/g s/VK_FORMAT_BC1_RGB_SRGB\b/VK_FORMAT_BC1_RGB_SRGB_BLOCK/g s/VK_FORMAT_BC1_RGBA_UNORM\b/VK_FORMAT_BC1_RGBA_UNORM_BLOCK/g s/VK_FORMAT_BC1_RGBA_SRGB\b/VK_FORMAT_BC1_RGBA_SRGB_BLOCK/g s/VK_FORMAT_BC2_UNORM\b/VK_FORMAT_BC2_UNORM_BLOCK/g s/VK_FORMAT_BC2_SRGB\b/VK_FORMAT_BC2_SRGB_BLOCK/g s/VK_FORMAT_BC3_UNORM\b/VK_FORMAT_BC3_UNORM_BLOCK/g s/VK_FORMAT_BC3_SRGB\b/VK_FORMAT_BC3_SRGB_BLOCK/g s/VK_FORMAT_BC4_UNORM\b/VK_FORMAT_BC4_UNORM_BLOCK/g s/VK_FORMAT_BC4_SNORM\b/VK_FORMAT_BC4_SNORM_BLOCK/g s/VK_FORMAT_BC5_UNORM\b/VK_FORMAT_BC5_UNORM_BLOCK/g s/VK_FORMAT_BC5_SNORM\b/VK_FORMAT_BC5_SNORM_BLOCK/g s/VK_FORMAT_BC6H_UFLOAT\b/VK_FORMAT_BC6H_UFLOAT_BLOCK/g s/VK_FORMAT_BC6H_SFLOAT\b/VK_FORMAT_BC6H_SFLOAT_BLOCK/g s/VK_FORMAT_BC7_UNORM\b/VK_FORMAT_BC7_UNORM_BLOCK/g s/VK_FORMAT_BC7_SRGB\b/VK_FORMAT_BC7_SRGB_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8_UNORM\b/VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8A1_UNORM\b/VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8A8_UNORM\b/VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK/g s/VK_FORMAT_EAC_R11_UNORM\b/VK_FORMAT_EAC_R11_UNORM_BLOCK/g s/VK_FORMAT_EAC_R11_SNORM\b/VK_FORMAT_EAC_R11_SNORM_BLOCK/g s/VK_FORMAT_EAC_R11G11_UNORM\b/VK_FORMAT_EAC_R11G11_UNORM_BLOCK/g s/VK_FORMAT_EAC_R11G11_SNORM\b/VK_FORMAT_EAC_R11G11_SNORM_BLOCK/g s/VK_FORMAT_ASTC_4x4_UNORM\b/VK_FORMAT_ASTC_4x4_UNORM_BLOCK/g s/VK_FORMAT_ASTC_4x4_SRGB\b/VK_FORMAT_ASTC_4x4_SRGB_BLOCK/g s/VK_FORMAT_ASTC_5x4_UNORM\b/VK_FORMAT_ASTC_5x4_UNORM_BLOCK/g s/VK_FORMAT_ASTC_5x4_SRGB\b/VK_FORMAT_ASTC_5x4_SRGB_BLOCK/g s/VK_FORMAT_ASTC_5x5_UNORM\b/VK_FORMAT_ASTC_5x5_UNORM_BLOCK/g s/VK_FORMAT_ASTC_5x5_SRGB\b/VK_FORMAT_ASTC_5x5_SRGB_BLOCK/g s/VK_FORMAT_ASTC_6x5_UNORM\b/VK_FORMAT_ASTC_6x5_UNORM_BLOCK/g s/VK_FORMAT_ASTC_6x5_SRGB\b/VK_FORMAT_ASTC_6x5_SRGB_BLOCK/g s/VK_FORMAT_ASTC_6x6_UNORM\b/VK_FORMAT_ASTC_6x6_UNORM_BLOCK/g s/VK_FORMAT_ASTC_6x6_SRGB\b/VK_FORMAT_ASTC_6x6_SRGB_BLOCK/g s/VK_FORMAT_ASTC_8x5_UNORM\b/VK_FORMAT_ASTC_8x5_UNORM_BLOCK/g s/VK_FORMAT_ASTC_8x5_SRGB\b/VK_FORMAT_ASTC_8x5_SRGB_BLOCK/g s/VK_FORMAT_ASTC_8x6_UNORM\b/VK_FORMAT_ASTC_8x6_UNORM_BLOCK/g s/VK_FORMAT_ASTC_8x6_SRGB\b/VK_FORMAT_ASTC_8x6_SRGB_BLOCK/g s/VK_FORMAT_ASTC_8x8_UNORM\b/VK_FORMAT_ASTC_8x8_UNORM_BLOCK/g s/VK_FORMAT_ASTC_8x8_SRGB\b/VK_FORMAT_ASTC_8x8_SRGB_BLOCK/g s/VK_FORMAT_ASTC_10x5_UNORM\b/VK_FORMAT_ASTC_10x5_UNORM_BLOCK/g s/VK_FORMAT_ASTC_10x5_SRGB\b/VK_FORMAT_ASTC_10x5_SRGB_BLOCK/g s/VK_FORMAT_ASTC_10x6_UNORM\b/VK_FORMAT_ASTC_10x6_UNORM_BLOCK/g s/VK_FORMAT_ASTC_10x6_SRGB\b/VK_FORMAT_ASTC_10x6_SRGB_BLOCK/g s/VK_FORMAT_ASTC_10x8_UNORM\b/VK_FORMAT_ASTC_10x8_UNORM_BLOCK/g s/VK_FORMAT_ASTC_10x8_SRGB\b/VK_FORMAT_ASTC_10x8_SRGB_BLOCK/g s/VK_FORMAT_ASTC_10x10_UNORM\b/VK_FORMAT_ASTC_10x10_UNORM_BLOCK/g s/VK_FORMAT_ASTC_10x10_SRGB\b/VK_FORMAT_ASTC_10x10_SRGB_BLOCK/g s/VK_FORMAT_ASTC_12x10_UNORM\b/VK_FORMAT_ASTC_12x10_UNORM_BLOCK/g s/VK_FORMAT_ASTC_12x10_SRGB\b/VK_FORMAT_ASTC_12x10_SRGB_BLOCK/g s/VK_FORMAT_ASTC_12x12_UNORM\b/VK_FORMAT_ASTC_12x12_UNORM_BLOCK/g s/VK_FORMAT_ASTC_12x12_SRGB\b/VK_FORMAT_ASTC_12x12_SRGB_BLOCK/g s/STR(BC1_RGB_UNORM\b/STR(BC1_RGB_UNORM_BLOCK/g s/STR(BC1_RGB_SRGB\b/STR(BC1_RGB_SRGB_BLOCK/g s/STR(BC1_RGBA_UNORM\b/STR(BC1_RGBA_UNORM_BLOCK/g s/STR(BC1_RGBA_SRGB\b/STR(BC1_RGBA_SRGB_BLOCK/g s/STR(BC2_UNORM\b/STR(BC2_UNORM_BLOCK/g s/STR(BC2_SRGB\b/STR(BC2_SRGB_BLOCK/g s/STR(BC3_UNORM\b/STR(BC3_UNORM_BLOCK/g s/STR(BC3_SRGB\b/STR(BC3_SRGB_BLOCK/g s/STR(BC4_UNORM\b/STR(BC4_UNORM_BLOCK/g s/STR(BC4_SNORM\b/STR(BC4_SNORM_BLOCK/g s/STR(BC5_UNORM\b/STR(BC5_UNORM_BLOCK/g s/STR(BC5_SNORM\b/STR(BC5_SNORM_BLOCK/g s/STR(BC6H_UFLOAT\b/STR(BC6H_UFLOAT_BLOCK/g s/STR(BC6H_SFLOAT\b/STR(BC6H_SFLOAT_BLOCK/g s/STR(BC7_UNORM\b/STR(BC7_UNORM_BLOCK/g s/STR(BC7_SRGB\b/STR(BC7_SRGB_BLOCK/g s/STR(ETC2_R8G8B8_UNORM\b/STR(ETC2_R8G8B8_UNORM_BLOCK/g s/STR(ETC2_R8G8B8A1_UNORM\b/STR(ETC2_R8G8B8A1_UNORM_BLOCK/g s/STR(ETC2_R8G8B8A8_UNORM\b/STR(ETC2_R8G8B8A8_UNORM_BLOCK/g s/STR(EAC_R11_UNORM\b/STR(EAC_R11_UNORM_BLOCK/g s/STR(EAC_R11_SNORM\b/STR(EAC_R11_SNORM_BLOCK/g s/STR(EAC_R11G11_UNORM\b/STR(EAC_R11G11_UNORM_BLOCK/g s/STR(EAC_R11G11_SNORM\b/STR(EAC_R11G11_SNORM_BLOCK/g s/STR(ASTC_4x4_UNORM\b/STR(ASTC_4x4_UNORM_BLOCK/g s/STR(ASTC_4x4_SRGB\b/STR(ASTC_4x4_SRGB_BLOCK/g s/STR(ASTC_5x4_UNORM\b/STR(ASTC_5x4_UNORM_BLOCK/g s/STR(ASTC_5x4_SRGB\b/STR(ASTC_5x4_SRGB_BLOCK/g s/STR(ASTC_5x5_UNORM\b/STR(ASTC_5x5_UNORM_BLOCK/g s/STR(ASTC_5x5_SRGB\b/STR(ASTC_5x5_SRGB_BLOCK/g s/STR(ASTC_6x5_UNORM\b/STR(ASTC_6x5_UNORM_BLOCK/g s/STR(ASTC_6x5_SRGB\b/STR(ASTC_6x5_SRGB_BLOCK/g s/STR(ASTC_6x6_UNORM\b/STR(ASTC_6x6_UNORM_BLOCK/g s/STR(ASTC_6x6_SRGB\b/STR(ASTC_6x6_SRGB_BLOCK/g s/STR(ASTC_8x5_UNORM\b/STR(ASTC_8x5_UNORM_BLOCK/g s/STR(ASTC_8x5_SRGB\b/STR(ASTC_8x5_SRGB_BLOCK/g s/STR(ASTC_8x6_UNORM\b/STR(ASTC_8x6_UNORM_BLOCK/g s/STR(ASTC_8x6_SRGB\b/STR(ASTC_8x6_SRGB_BLOCK/g s/STR(ASTC_8x8_UNORM\b/STR(ASTC_8x8_UNORM_BLOCK/g s/STR(ASTC_8x8_SRGB\b/STR(ASTC_8x8_SRGB_BLOCK/g s/STR(ASTC_10x5_UNORM\b/STR(ASTC_10x5_UNORM_BLOCK/g s/STR(ASTC_10x5_SRGB\b/STR(ASTC_10x5_SRGB_BLOCK/g s/STR(ASTC_10x6_UNORM\b/STR(ASTC_10x6_UNORM_BLOCK/g s/STR(ASTC_10x6_SRGB\b/STR(ASTC_10x6_SRGB_BLOCK/g s/STR(ASTC_10x8_UNORM\b/STR(ASTC_10x8_UNORM_BLOCK/g s/STR(ASTC_10x8_SRGB\b/STR(ASTC_10x8_SRGB_BLOCK/g s/STR(ASTC_10x10_UNORM\b/STR(ASTC_10x10_UNORM_BLOCK/g s/STR(ASTC_10x10_SRGB\b/STR(ASTC_10x10_SRGB_BLOCK/g s/STR(ASTC_12x10_UNORM\b/STR(ASTC_12x10_UNORM_BLOCK/g s/STR(ASTC_12x10_SRGB\b/STR(ASTC_12x10_SRGB_BLOCK/g s/STR(ASTC_12x12_UNORM\b/STR(ASTC_12x12_UNORM_BLOCK/g s/STR(ASTC_12x12_SRGB\b/STR(ASTC_12x12_SRGB_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8_SRGB\b/VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8A1_SRGB\b/VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK/g s/VK_FORMAT_ETC2_R8G8B8A8_SRGB\b/VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK/g --- include/vulkan/vulkan.h | 108 ++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'include') diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index bec7fb33..23b379a9 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -303,60 +303,60 @@ typedef enum VkFormat { VK_FORMAT_D16_UNORM_S8_UINT = 93, VK_FORMAT_D24_UNORM_S8_UINT = 94, VK_FORMAT_D32_SFLOAT_S8_UINT = 95, - VK_FORMAT_BC1_RGB_UNORM = 96, - VK_FORMAT_BC1_RGB_SRGB = 97, - VK_FORMAT_BC1_RGBA_UNORM = 98, - VK_FORMAT_BC1_RGBA_SRGB = 99, - VK_FORMAT_BC2_UNORM = 100, - VK_FORMAT_BC2_SRGB = 101, - VK_FORMAT_BC3_UNORM = 102, - VK_FORMAT_BC3_SRGB = 103, - VK_FORMAT_BC4_UNORM = 104, - VK_FORMAT_BC4_SNORM = 105, - VK_FORMAT_BC5_UNORM = 106, - VK_FORMAT_BC5_SNORM = 107, - VK_FORMAT_BC6H_UFLOAT = 108, - VK_FORMAT_BC6H_SFLOAT = 109, - VK_FORMAT_BC7_UNORM = 110, - VK_FORMAT_BC7_SRGB = 111, - VK_FORMAT_ETC2_R8G8B8_UNORM = 112, - VK_FORMAT_ETC2_R8G8B8_SRGB = 113, - VK_FORMAT_ETC2_R8G8B8A1_UNORM = 114, - VK_FORMAT_ETC2_R8G8B8A1_SRGB = 115, - VK_FORMAT_ETC2_R8G8B8A8_UNORM = 116, - VK_FORMAT_ETC2_R8G8B8A8_SRGB = 117, - VK_FORMAT_EAC_R11_UNORM = 118, - VK_FORMAT_EAC_R11_SNORM = 119, - VK_FORMAT_EAC_R11G11_UNORM = 120, - VK_FORMAT_EAC_R11G11_SNORM = 121, - VK_FORMAT_ASTC_4x4_UNORM = 122, - VK_FORMAT_ASTC_4x4_SRGB = 123, - VK_FORMAT_ASTC_5x4_UNORM = 124, - VK_FORMAT_ASTC_5x4_SRGB = 125, - VK_FORMAT_ASTC_5x5_UNORM = 126, - VK_FORMAT_ASTC_5x5_SRGB = 127, - VK_FORMAT_ASTC_6x5_UNORM = 128, - VK_FORMAT_ASTC_6x5_SRGB = 129, - VK_FORMAT_ASTC_6x6_UNORM = 130, - VK_FORMAT_ASTC_6x6_SRGB = 131, - VK_FORMAT_ASTC_8x5_UNORM = 132, - VK_FORMAT_ASTC_8x5_SRGB = 133, - VK_FORMAT_ASTC_8x6_UNORM = 134, - VK_FORMAT_ASTC_8x6_SRGB = 135, - VK_FORMAT_ASTC_8x8_UNORM = 136, - VK_FORMAT_ASTC_8x8_SRGB = 137, - VK_FORMAT_ASTC_10x5_UNORM = 138, - VK_FORMAT_ASTC_10x5_SRGB = 139, - VK_FORMAT_ASTC_10x6_UNORM = 140, - VK_FORMAT_ASTC_10x6_SRGB = 141, - VK_FORMAT_ASTC_10x8_UNORM = 142, - VK_FORMAT_ASTC_10x8_SRGB = 143, - VK_FORMAT_ASTC_10x10_UNORM = 144, - VK_FORMAT_ASTC_10x10_SRGB = 145, - VK_FORMAT_ASTC_12x10_UNORM = 146, - VK_FORMAT_ASTC_12x10_SRGB = 147, - VK_FORMAT_ASTC_12x12_UNORM = 148, - VK_FORMAT_ASTC_12x12_SRGB = 149, + VK_FORMAT_BC1_RGB_UNORM_BLOCK = 96, + VK_FORMAT_BC1_RGB_SRGB_BLOCK = 97, + VK_FORMAT_BC1_RGBA_UNORM_BLOCK = 98, + VK_FORMAT_BC1_RGBA_SRGB_BLOCK = 99, + VK_FORMAT_BC2_UNORM_BLOCK = 100, + VK_FORMAT_BC2_SRGB_BLOCK = 101, + VK_FORMAT_BC3_UNORM_BLOCK = 102, + VK_FORMAT_BC3_SRGB_BLOCK = 103, + VK_FORMAT_BC4_UNORM_BLOCK = 104, + VK_FORMAT_BC4_SNORM_BLOCK = 105, + VK_FORMAT_BC5_UNORM_BLOCK = 106, + VK_FORMAT_BC5_SNORM_BLOCK = 107, + VK_FORMAT_BC6H_UFLOAT_BLOCK = 108, + VK_FORMAT_BC6H_SFLOAT_BLOCK = 109, + VK_FORMAT_BC7_UNORM_BLOCK = 110, + VK_FORMAT_BC7_SRGB_BLOCK = 111, + VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK = 112, + VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK = 113, + VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK = 114, + VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK = 115, + VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK = 116, + VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK = 117, + VK_FORMAT_EAC_R11_UNORM_BLOCK = 118, + VK_FORMAT_EAC_R11_SNORM_BLOCK = 119, + VK_FORMAT_EAC_R11G11_UNORM_BLOCK = 120, + VK_FORMAT_EAC_R11G11_SNORM_BLOCK = 121, + VK_FORMAT_ASTC_4x4_UNORM_BLOCK = 122, + VK_FORMAT_ASTC_4x4_SRGB_BLOCK = 123, + VK_FORMAT_ASTC_5x4_UNORM_BLOCK = 124, + VK_FORMAT_ASTC_5x4_SRGB_BLOCK = 125, + VK_FORMAT_ASTC_5x5_UNORM_BLOCK = 126, + VK_FORMAT_ASTC_5x5_SRGB_BLOCK = 127, + VK_FORMAT_ASTC_6x5_UNORM_BLOCK = 128, + VK_FORMAT_ASTC_6x5_SRGB_BLOCK = 129, + VK_FORMAT_ASTC_6x6_UNORM_BLOCK = 130, + VK_FORMAT_ASTC_6x6_SRGB_BLOCK = 131, + VK_FORMAT_ASTC_8x5_UNORM_BLOCK = 132, + VK_FORMAT_ASTC_8x5_SRGB_BLOCK = 133, + VK_FORMAT_ASTC_8x6_UNORM_BLOCK = 134, + VK_FORMAT_ASTC_8x6_SRGB_BLOCK = 135, + VK_FORMAT_ASTC_8x8_UNORM_BLOCK = 136, + VK_FORMAT_ASTC_8x8_SRGB_BLOCK = 137, + VK_FORMAT_ASTC_10x5_UNORM_BLOCK = 138, + VK_FORMAT_ASTC_10x5_SRGB_BLOCK = 139, + VK_FORMAT_ASTC_10x6_UNORM_BLOCK = 140, + VK_FORMAT_ASTC_10x6_SRGB_BLOCK = 141, + VK_FORMAT_ASTC_10x8_UNORM_BLOCK = 142, + VK_FORMAT_ASTC_10x8_SRGB_BLOCK = 143, + VK_FORMAT_ASTC_10x10_UNORM_BLOCK = 144, + VK_FORMAT_ASTC_10x10_SRGB_BLOCK = 145, + VK_FORMAT_ASTC_12x10_UNORM_BLOCK = 146, + 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, -- cgit v1.2.3