From c8fd8d0cb88ed6eb8b3446aad46d15bbfc9eb548 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 10 Nov 2015 17:01:22 +0800 Subject: bug 12998 part 2: append _PACK* to packed formats that change conventions s/VK_FORMAT_R11G11B10_UFLOAT\b/VK_FORMAT_B10G11R11_UFLOAT_PACK32/g s/VK_FORMAT_R9G9B9E5_UFLOAT\b/VK_FORMAT_E5B9G9R9_UFLOAT_PACK32/g s/VK_FORMAT_D24_UNORM_X8\b/VK_FORMAT_X8_D24_UNORM_PACK32/g s/VK_FORMAT_R10G10B10A2_UNORM\b/VK_FORMAT_A2B10G10R10_UNORM_PACK32/g s/VK_FORMAT_R10G10B10A2_SNORM\b/VK_FORMAT_A2B10G10R10_SNORM_PACK32/g s/VK_FORMAT_R10G10B10A2_USCALED\b/VK_FORMAT_A2B10G10R10_USCALED_PACK32/g s/VK_FORMAT_R10G10B10A2_SSCALED\b/VK_FORMAT_A2B10G10R10_SSCALED_PACK32/g s/VK_FORMAT_R10G10B10A2_UINT\b/VK_FORMAT_A2B10G10R10_UINT_PACK32/g s/VK_FORMAT_R10G10B10A2_SINT\b/VK_FORMAT_A2B10G10R10_SINT_PACK32/g s/VK_FORMAT_B10G10R10A2_UNORM\b/VK_FORMAT_A2R10G10B10_UNORM_PACK32/g s/VK_FORMAT_B10G10R10A2_SNORM\b/VK_FORMAT_A2R10G10B10_SNORM_PACK32/g s/VK_FORMAT_B10G10R10A2_USCALED\b/VK_FORMAT_A2R10G10B10_USCALED_PACK32/g s/VK_FORMAT_B10G10R10A2_SSCALED\b/VK_FORMAT_A2R10G10B10_SSCALED_PACK32/g s/VK_FORMAT_B10G10R10A2_UINT\b/VK_FORMAT_A2R10G10B10_UINT_PACK32/g s/VK_FORMAT_B10G10R10A2_SINT\b/VK_FORMAT_A2R10G10B10_SINT_PACK32/g s/STR(R11G11B10_UFLOAT\b/STR(B10G11R11_UFLOAT_PACK32/g s/STR(R9G9B9E5_UFLOAT\b/STR(E5B9G9R9_UFLOAT_PACK32/g s/STR(D24_UNORM_X8\b/STR(X8_D24_UNORM_PACK32/g s/STR(R10G10B10A2_UNORM\b/STR(A2B10G10R10_UNORM_PACK32/g s/STR(R10G10B10A2_SNORM\b/STR(A2B10G10R10_SNORM_PACK32/g s/STR(R10G10B10A2_USCALED\b/STR(A2B10G10R10_USCALED_PACK32/g s/STR(R10G10B10A2_SSCALED\b/STR(A2B10G10R10_SSCALED_PACK32/g s/STR(R10G10B10A2_UINT\b/STR(A2B10G10R10_UINT_PACK32/g s/STR(R10G10B10A2_SINT\b/STR(A2B10G10R10_SINT_PACK32/g s/STR(B10G10R10A2_UNORM\b/STR(A2R10G10B10_UNORM_PACK32/g s/STR(B10G10R10A2_SNORM\b/STR(A2R10G10B10_SNORM_PACK32/g s/STR(B10G10R10A2_USCALED\b/STR(A2R10G10B10_USCALED_PACK32/g s/STR(B10G10R10A2_SSCALED\b/STR(A2R10G10B10_SSCALED_PACK32/g s/STR(B10G10R10A2_UINT\b/STR(A2R10G10B10_UINT_PACK32/g s/STR(B10G10R10A2_SINT\b/STR(A2R10G10B10_SINT_PACK32/g --- demos/vulkaninfo.c | 30 +++++++++--------- icd/common/icd-format.c | 80 +++++++++++++++++++++++------------------------ include/vulkan/vulkan.h | 34 ++++++++++---------- layers/image.cpp | 2 +- layers/shader_checker.cpp | 8 ++--- layers/vk_layer_utils.cpp | 52 +++++++++++++++--------------- 6 files changed, 103 insertions(+), 103 deletions(-) diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index f26d779a..d3850809 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -206,12 +206,12 @@ static const char *vk_format_string(VkFormat fmt) STR(R8G8B8A8_UINT); STR(R8G8B8A8_SINT); STR(R8G8B8A8_SRGB); - STR(R10G10B10A2_UNORM); - STR(R10G10B10A2_SNORM); - STR(R10G10B10A2_USCALED); - STR(R10G10B10A2_SSCALED); - STR(R10G10B10A2_UINT); - STR(R10G10B10A2_SINT); + STR(A2B10G10R10_UNORM_PACK32); + STR(A2B10G10R10_SNORM_PACK32); + STR(A2B10G10R10_USCALED_PACK32); + STR(A2B10G10R10_SSCALED_PACK32); + STR(A2B10G10R10_UINT_PACK32); + STR(A2B10G10R10_SINT_PACK32); STR(R16_UNORM); STR(R16_SNORM); STR(R16_USCALED); @@ -256,10 +256,10 @@ static const char *vk_format_string(VkFormat fmt) STR(R64G64_SFLOAT); STR(R64G64B64_SFLOAT); STR(R64G64B64A64_SFLOAT); - STR(R11G11B10_UFLOAT); - STR(R9G9B9E5_UFLOAT); + STR(B10G11R11_UFLOAT_PACK32); + STR(E5B9G9R9_UFLOAT_PACK32); STR(D16_UNORM); - STR(D24_UNORM_X8); + STR(X8_D24_UNORM_PACK32); STR(D32_SFLOAT); STR(S8_UINT); STR(D16_UNORM_S8_UINT); @@ -330,12 +330,12 @@ static const char *vk_format_string(VkFormat fmt) STR(B8G8R8A8_UINT); STR(B8G8R8A8_SINT); STR(B8G8R8A8_SRGB); - STR(B10G10R10A2_UNORM); - STR(B10G10R10A2_SNORM); - STR(B10G10R10A2_USCALED); - STR(B10G10R10A2_SSCALED); - STR(B10G10R10A2_UINT); - STR(B10G10R10A2_SINT); + STR(A2R10G10B10_UNORM_PACK32); + STR(A2R10G10B10_SNORM_PACK32); + STR(A2R10G10B10_USCALED_PACK32); + STR(A2R10G10B10_SSCALED_PACK32); + STR(A2R10G10B10_UINT_PACK32); + STR(A2R10G10B10_SINT_PACK32); #undef STR default: return "UNKNOWN_FORMAT"; } diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index 8bb217ff..daa73f7d 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -72,12 +72,12 @@ static const struct icd_format_info { [VK_FORMAT_R8G8B8A8_UINT] = { 4, 4 }, [VK_FORMAT_R8G8B8A8_SINT] = { 4, 4 }, [VK_FORMAT_R8G8B8A8_SRGB] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_UNORM] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_SNORM] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_USCALED] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_SSCALED] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_UINT] = { 4, 4 }, - [VK_FORMAT_R10G10B10A2_SINT] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_UNORM_PACK32] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_SNORM_PACK32] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_USCALED_PACK32] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_SSCALED_PACK32] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_UINT_PACK32] = { 4, 4 }, + [VK_FORMAT_A2B10G10R10_SINT_PACK32] = { 4, 4 }, [VK_FORMAT_R16_UNORM] = { 2, 1 }, [VK_FORMAT_R16_SNORM] = { 2, 1 }, [VK_FORMAT_R16_USCALED] = { 2, 1 }, @@ -122,10 +122,10 @@ static const struct icd_format_info { [VK_FORMAT_R64G64_SFLOAT] = { 16, 2 }, [VK_FORMAT_R64G64B64_SFLOAT] = { 24, 3 }, [VK_FORMAT_R64G64B64A64_SFLOAT] = { 32, 4 }, - [VK_FORMAT_R11G11B10_UFLOAT] = { 4, 3 }, - [VK_FORMAT_R9G9B9E5_UFLOAT] = { 4, 3 }, + [VK_FORMAT_B10G11R11_UFLOAT_PACK32] = { 4, 3 }, + [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32] = { 4, 3 }, [VK_FORMAT_D16_UNORM] = { 2, 1 }, - [VK_FORMAT_D24_UNORM_X8] = { 3, 1 }, + [VK_FORMAT_X8_D24_UNORM_PACK32] = { 3, 1 }, [VK_FORMAT_D32_SFLOAT] = { 4, 1 }, [VK_FORMAT_S8_UINT] = { 1, 1 }, [VK_FORMAT_D16_UNORM_S8_UINT] = { 3, 2 }, @@ -199,12 +199,12 @@ static const struct icd_format_info { [VK_FORMAT_B8G8R8A8_UINT] = { 4, 4 }, [VK_FORMAT_B8G8R8A8_SINT] = { 4, 4 }, [VK_FORMAT_B8G8R8A8_SRGB] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_UNORM] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_SNORM] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_USCALED] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_SSCALED] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_UINT] = { 4, 4 }, - [VK_FORMAT_B10G10R10A2_SINT] = { 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 }, }; bool icd_format_is_ds(VkFormat format) @@ -213,7 +213,7 @@ bool icd_format_is_ds(VkFormat format) switch (format) { case VK_FORMAT_D16_UNORM: - case VK_FORMAT_D24_UNORM_X8: + case VK_FORMAT_X8_D24_UNORM_PACK32: case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_S8_UINT: case VK_FORMAT_D16_UNORM_S8_UINT: @@ -245,8 +245,8 @@ bool icd_format_is_norm(VkFormat format) case VK_FORMAT_R8G8B8_SNORM: case VK_FORMAT_R8G8B8A8_UNORM: case VK_FORMAT_R8G8B8A8_SNORM: - case VK_FORMAT_R10G10B10A2_UNORM: - case VK_FORMAT_R10G10B10A2_SNORM: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_A2B10G10R10_SNORM_PACK32: case VK_FORMAT_R16_UNORM: case VK_FORMAT_R16_SNORM: case VK_FORMAT_R16G16_UNORM: @@ -289,8 +289,8 @@ bool icd_format_is_norm(VkFormat format) case VK_FORMAT_B8G8R8_SNORM: case VK_FORMAT_B8G8R8A8_UNORM: case VK_FORMAT_B8G8R8A8_SNORM: - case VK_FORMAT_B10G10R10A2_UNORM: - case VK_FORMAT_B10G10R10A2_SNORM: + case VK_FORMAT_A2R10G10B10_UNORM_PACK32: + case VK_FORMAT_A2R10G10B10_SNORM_PACK32: is_norm = true; break; default: @@ -313,8 +313,8 @@ bool icd_format_is_int(VkFormat format) case VK_FORMAT_R8G8B8_SINT: case VK_FORMAT_R8G8B8A8_UINT: case VK_FORMAT_R8G8B8A8_SINT: - case VK_FORMAT_R10G10B10A2_UINT: - case VK_FORMAT_R10G10B10A2_SINT: + case VK_FORMAT_A2B10G10R10_UINT_PACK32: + case VK_FORMAT_A2B10G10R10_SINT_PACK32: case VK_FORMAT_R16_UINT: case VK_FORMAT_R16_SINT: case VK_FORMAT_R16G16_UINT: @@ -335,8 +335,8 @@ bool icd_format_is_int(VkFormat format) case VK_FORMAT_B8G8R8_SINT: case VK_FORMAT_B8G8R8A8_UINT: case VK_FORMAT_B8G8R8A8_SINT: - case VK_FORMAT_B10G10R10A2_UINT: - case VK_FORMAT_B10G10R10A2_SINT: + case VK_FORMAT_A2R10G10B10_UINT_PACK32: + case VK_FORMAT_A2R10G10B10_SINT_PACK32: is_int = true; break; default: @@ -363,8 +363,8 @@ bool icd_format_is_float(VkFormat format) case VK_FORMAT_R64G64_SFLOAT: case VK_FORMAT_R64G64B64_SFLOAT: case VK_FORMAT_R64G64B64A64_SFLOAT: - case VK_FORMAT_R11G11B10_UFLOAT: - case VK_FORMAT_R9G9B9E5_UFLOAT: + case VK_FORMAT_B10G11R11_UFLOAT_PACK32: + case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32: case VK_FORMAT_BC6H_UFLOAT_BLOCK: case VK_FORMAT_BC6H_SFLOAT_BLOCK: is_float = true; @@ -562,17 +562,17 @@ void icd_format_get_raw_value(VkFormat format, ((uint8_t *) value)[2] = (uint8_t) color[0]; ((uint8_t *) value)[3] = (uint8_t) color[3]; break; - case VK_FORMAT_R11G11B10_UFLOAT: + case VK_FORMAT_B10G11R11_UFLOAT_PACK32: ((uint32_t *) value)[0] = (color[0] & 0x7ff) << 0 | (color[1] & 0x7ff) << 11 | (color[2] & 0x3ff) << 22; break; - case VK_FORMAT_R10G10B10A2_UNORM: - case VK_FORMAT_R10G10B10A2_SNORM: - case VK_FORMAT_R10G10B10A2_USCALED: - case VK_FORMAT_R10G10B10A2_SSCALED: - case VK_FORMAT_R10G10B10A2_UINT: - case VK_FORMAT_R10G10B10A2_SINT: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_A2B10G10R10_SNORM_PACK32: + case VK_FORMAT_A2B10G10R10_USCALED_PACK32: + case VK_FORMAT_A2B10G10R10_SSCALED_PACK32: + case VK_FORMAT_A2B10G10R10_UINT_PACK32: + case VK_FORMAT_A2B10G10R10_SINT_PACK32: ((uint32_t *) value)[0] = (color[0] & 0x3ff) << 0 | (color[1] & 0x3ff) << 10 | (color[2] & 0x3ff) << 20 | @@ -643,7 +643,7 @@ void icd_format_get_raw_value(VkFormat format, ((uint32_t *) value)[0] = (uint32_t) color[0]; ((char *) value)[4] = (uint8_t) color[1]; break; - case VK_FORMAT_R9G9B9E5_UFLOAT: + case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32: ((uint32_t *) value)[0] = (color[0] & 0x1ff) << 0 | (color[1] & 0x1ff) << 9 | (color[2] & 0x1ff) << 18 | @@ -691,12 +691,12 @@ void icd_format_get_raw_value(VkFormat format, ((uint16_t *) value)[1] = (uint16_t) color[1]; ((uint16_t *) value)[2] = (uint16_t) color[2]; break; - case VK_FORMAT_B10G10R10A2_UNORM: - case VK_FORMAT_B10G10R10A2_SNORM: - case VK_FORMAT_B10G10R10A2_USCALED: - case VK_FORMAT_B10G10R10A2_SSCALED: - case VK_FORMAT_B10G10R10A2_UINT: - case VK_FORMAT_B10G10R10A2_SINT: + case VK_FORMAT_A2R10G10B10_UNORM_PACK32: + case VK_FORMAT_A2R10G10B10_SNORM_PACK32: + case VK_FORMAT_A2R10G10B10_USCALED_PACK32: + case VK_FORMAT_A2R10G10B10_SSCALED_PACK32: + case VK_FORMAT_A2R10G10B10_UINT_PACK32: + case VK_FORMAT_A2R10G10B10_SINT_PACK32: ((uint32_t *) value)[0] = (color[2] & 0x3ff) << 0 | (color[1] & 0x3ff) << 10 | (color[0] & 0x3ff) << 20 | diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 23b379a9..2087b518 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -244,12 +244,12 @@ typedef enum VkFormat { VK_FORMAT_R8G8B8A8_UINT = 34, VK_FORMAT_R8G8B8A8_SINT = 35, VK_FORMAT_R8G8B8A8_SRGB = 36, - VK_FORMAT_R10G10B10A2_UNORM = 37, - VK_FORMAT_R10G10B10A2_SNORM = 38, - VK_FORMAT_R10G10B10A2_USCALED = 39, - VK_FORMAT_R10G10B10A2_SSCALED = 40, - VK_FORMAT_R10G10B10A2_UINT = 41, - VK_FORMAT_R10G10B10A2_SINT = 42, + VK_FORMAT_A2B10G10R10_UNORM_PACK32 = 37, + VK_FORMAT_A2B10G10R10_SNORM_PACK32 = 38, + VK_FORMAT_A2B10G10R10_USCALED_PACK32 = 39, + VK_FORMAT_A2B10G10R10_SSCALED_PACK32 = 40, + VK_FORMAT_A2B10G10R10_UINT_PACK32 = 41, + VK_FORMAT_A2B10G10R10_SINT_PACK32 = 42, VK_FORMAT_R16_UNORM = 43, VK_FORMAT_R16_SNORM = 44, VK_FORMAT_R16_USCALED = 45, @@ -294,10 +294,10 @@ typedef enum VkFormat { VK_FORMAT_R64G64_SFLOAT = 84, VK_FORMAT_R64G64B64_SFLOAT = 85, VK_FORMAT_R64G64B64A64_SFLOAT = 86, - VK_FORMAT_R11G11B10_UFLOAT = 87, - VK_FORMAT_R9G9B9E5_UFLOAT = 88, + VK_FORMAT_B10G11R11_UFLOAT_PACK32 = 87, + VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 = 88, VK_FORMAT_D16_UNORM = 89, - VK_FORMAT_D24_UNORM_X8 = 90, + VK_FORMAT_X8_D24_UNORM_PACK32 = 90, VK_FORMAT_D32_SFLOAT = 91, VK_FORMAT_S8_UINT = 92, VK_FORMAT_D16_UNORM_S8_UINT = 93, @@ -375,15 +375,15 @@ typedef enum VkFormat { VK_FORMAT_B8G8R8A8_UINT = 165, VK_FORMAT_B8G8R8A8_SINT = 166, VK_FORMAT_B8G8R8A8_SRGB = 167, - VK_FORMAT_B10G10R10A2_UNORM = 168, - VK_FORMAT_B10G10R10A2_SNORM = 169, - VK_FORMAT_B10G10R10A2_USCALED = 170, - VK_FORMAT_B10G10R10A2_SSCALED = 171, - VK_FORMAT_B10G10R10A2_UINT = 172, - VK_FORMAT_B10G10R10A2_SINT = 173, + VK_FORMAT_A2R10G10B10_UNORM_PACK32 = 168, + VK_FORMAT_A2R10G10B10_SNORM_PACK32 = 169, + VK_FORMAT_A2R10G10B10_USCALED_PACK32 = 170, + VK_FORMAT_A2R10G10B10_SSCALED_PACK32 = 171, + VK_FORMAT_A2R10G10B10_UINT_PACK32 = 172, + VK_FORMAT_A2R10G10B10_SINT_PACK32 = 173, VK_FORMAT_BEGIN_RANGE = VK_FORMAT_UNDEFINED, - VK_FORMAT_END_RANGE = VK_FORMAT_B10G10R10A2_SINT, - VK_FORMAT_RANGE_SIZE = (VK_FORMAT_B10G10R10A2_SINT - VK_FORMAT_UNDEFINED + 1), + VK_FORMAT_END_RANGE = VK_FORMAT_A2R10G10B10_SINT_PACK32, + VK_FORMAT_RANGE_SIZE = (VK_FORMAT_A2R10G10B10_SINT_PACK32 - VK_FORMAT_UNDEFINED + 1), VK_FORMAT_MAX_ENUM = 0x7FFFFFFF } VkFormat; diff --git a/layers/image.cpp b/layers/image.cpp index 4c08a833..d97d77bc 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -241,7 +241,7 @@ bool is_depth_format(VkFormat format) bool result = VK_FALSE; switch (format) { case VK_FORMAT_D16_UNORM: - case VK_FORMAT_D24_UNORM_X8: + case VK_FORMAT_X8_D24_UNORM_PACK32: case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_S8_UINT: case VK_FORMAT_D16_UNORM_S8_UINT: diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 260a275a..c3c68e09 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -736,8 +736,8 @@ get_format_type(VkFormat fmt) { case VK_FORMAT_R32G32B32A32_SINT: case VK_FORMAT_B8G8R8_SINT: case VK_FORMAT_B8G8R8A8_SINT: - case VK_FORMAT_R10G10B10A2_SINT: - case VK_FORMAT_B10G10R10A2_SINT: + case VK_FORMAT_A2B10G10R10_SINT_PACK32: + case VK_FORMAT_A2R10G10B10_SINT_PACK32: return FORMAT_TYPE_SINT; case VK_FORMAT_R8_UINT: case VK_FORMAT_R8G8_UINT: @@ -753,8 +753,8 @@ get_format_type(VkFormat fmt) { case VK_FORMAT_R32G32B32A32_UINT: case VK_FORMAT_B8G8R8_UINT: case VK_FORMAT_B8G8R8A8_UINT: - case VK_FORMAT_R10G10B10A2_UINT: - case VK_FORMAT_B10G10R10A2_UINT: + case VK_FORMAT_A2B10G10R10_UINT_PACK32: + case VK_FORMAT_A2R10G10B10_UINT_PACK32: return FORMAT_TYPE_UINT; default: return FORMAT_TYPE_FLOAT; diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp index 377cbbfd..a85d0f99 100644 --- a/layers/vk_layer_utils.cpp +++ b/layers/vk_layer_utils.cpp @@ -74,12 +74,12 @@ 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_R10G10B10A2_UNORM] - { 4, 4 }, // [VK_FORMAT_R10G10B10A2_SNORM] - { 4, 4 }, // [VK_FORMAT_R10G10B10A2_USCALED] - { 4, 4 }, // [VK_FORMAT_R10G10B10A2_SSCALED] - { 4, 4 }, // [VK_FORMAT_R10G10B10A2_UINT] - { 4, 4 }, // [VK_FORMAT_R10G10B10A2_SINT] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_UNORM_PACK32] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_SNORM_PACK32] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_USCALED_PACK32] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_SSCALED_PACK32] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_UINT_PACK32] + { 4, 4 }, // [VK_FORMAT_A2B10G10R10_SINT_PACK32] { 2, 1 }, // [VK_FORMAT_R16_UNORM] { 2, 1 }, // [VK_FORMAT_R16_SNORM] { 2, 1 }, // [VK_FORMAT_R16_USCALED] @@ -124,10 +124,10 @@ static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = { { 16, 2 }, // [VK_FORMAT_R64G64_SFLOAT] { 24, 3 }, // [VK_FORMAT_R64G64B64_SFLOAT] { 32, 4 }, // [VK_FORMAT_R64G64B64A64_SFLOAT] - { 4, 3 }, // [VK_FORMAT_R11G11B10_UFLOAT] - { 4, 3 }, // [VK_FORMAT_R9G9B9E5_UFLOAT] + { 4, 3 }, // [VK_FORMAT_B10G11R11_UFLOAT_PACK32] + { 4, 3 }, // [VK_FORMAT_E5B9G9R9_UFLOAT_PACK32] { 2, 1 }, // [VK_FORMAT_D16_UNORM] - { 3, 1 }, // [VK_FORMAT_D24_UNORM_X8] + { 3, 1 }, // [VK_FORMAT_X8_D24_UNORM_PACK32] { 4, 1 }, // [VK_FORMAT_D32_SFLOAT] { 1, 1 }, // [VK_FORMAT_S8_UINT] { 3, 2 }, // [VK_FORMAT_D16_UNORM_S8_UINT] @@ -203,12 +203,12 @@ 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_B10G10R10A2_UNORM] - { 4, 4 }, // [VK_FORMAT_B10G10R10A2_SNORM] - { 4, 4 }, // [VK_FORMAT_B10G10R10A2_USCALED] - { 4, 4 }, // [VK_FORMAT_B10G10R10A2_SSCALED] - { 4, 4 }, // [VK_FORMAT_B10G10R10A2_UINT] - { 4, 4 }, // [VK_FORMAT_B10G10R10A2_SINT] + { 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 @@ -249,7 +249,7 @@ bool vk_format_is_depth_only(VkFormat format) switch (format) { case VK_FORMAT_D16_UNORM: - case VK_FORMAT_D24_UNORM_X8: + case VK_FORMAT_X8_D24_UNORM_PACK32: case VK_FORMAT_D32_SFLOAT: is_depth = true; break; @@ -278,8 +278,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_R10G10B10A2_UNORM: - case VK_FORMAT_R10G10B10A2_SNORM: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_A2B10G10R10_SNORM_PACK32: case VK_FORMAT_R16_UNORM: case VK_FORMAT_R16_SNORM: case VK_FORMAT_R16G16_UNORM: @@ -322,8 +322,8 @@ bool vk_format_is_norm(VkFormat format) case VK_FORMAT_B8G8R8_SNORM: case VK_FORMAT_B8G8R8A8_UNORM: case VK_FORMAT_B8G8R8A8_SNORM: - case VK_FORMAT_B10G10R10A2_UNORM: - case VK_FORMAT_B10G10R10A2_SNORM: + case VK_FORMAT_A2R10G10B10_UNORM_PACK32: + case VK_FORMAT_A2R10G10B10_SNORM_PACK32: is_norm = true; break; default: @@ -350,7 +350,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_R10G10B10A2_UINT: + case VK_FORMAT_A2B10G10R10_UINT_PACK32: case VK_FORMAT_R16_UINT: case VK_FORMAT_R16G16_UINT: case VK_FORMAT_R16G16B16_UINT: @@ -361,7 +361,7 @@ bool vk_format_is_uint(VkFormat format) case VK_FORMAT_R32G32B32A32_UINT: case VK_FORMAT_B8G8R8_UINT: case VK_FORMAT_B8G8R8A8_UINT: - case VK_FORMAT_B10G10R10A2_UINT: + case VK_FORMAT_A2R10G10B10_UINT_PACK32: is_uint = true; break; default: @@ -381,7 +381,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_R10G10B10A2_SINT: + case VK_FORMAT_A2B10G10R10_SINT_PACK32: case VK_FORMAT_R16_SINT: case VK_FORMAT_R16G16_SINT: case VK_FORMAT_R16G16B16_SINT: @@ -392,7 +392,7 @@ bool vk_format_is_sint(VkFormat format) case VK_FORMAT_R32G32B32A32_SINT: case VK_FORMAT_B8G8R8_SINT: case VK_FORMAT_B8G8R8A8_SINT: - case VK_FORMAT_B10G10R10A2_SINT: + case VK_FORMAT_A2R10G10B10_SINT_PACK32: is_sint = true; break; default: @@ -420,8 +420,8 @@ bool vk_format_is_float(VkFormat format) case VK_FORMAT_R64G64_SFLOAT: case VK_FORMAT_R64G64B64_SFLOAT: case VK_FORMAT_R64G64B64A64_SFLOAT: - case VK_FORMAT_R11G11B10_UFLOAT: - case VK_FORMAT_R9G9B9E5_UFLOAT: + case VK_FORMAT_B10G11R11_UFLOAT_PACK32: + case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32: case VK_FORMAT_BC6H_UFLOAT_BLOCK: case VK_FORMAT_BC6H_SFLOAT_BLOCK: is_float = true; -- cgit v1.2.3