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 --- layers/shader_checker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'layers/shader_checker.cpp') 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; -- cgit v1.2.3