From 63da97452964027012ccc67e22e9e8d3cb27247d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 20 May 2015 14:38:11 -0700 Subject: [PATCH] vk: Mark remaining unsupported formats as such --- src/vulkan/formats.c | 152 ++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/src/vulkan/formats.c b/src/vulkan/formats.c index c1cdc977ac4..13ae1ed7538 100644 --- a/src/vulkan/formats.c +++ b/src/vulkan/formats.c @@ -115,85 +115,87 @@ static const struct anv_format anv_formats[] = { [VK_FORMAT_R64G64B64A64_SFLOAT] = { .format = R64G64B64A64_FLOAT, .cpp = 32, .channels = 4 }, [VK_FORMAT_R11G11B10_UFLOAT] = { .format = R11G11B10_FLOAT, .cpp = 4, .channels = 3 }, [VK_FORMAT_R9G9B9E5_UFLOAT] = { .format = R9G9B9E5_SHAREDEXP, .cpp = 4, .channels = 3 }, - // [VK_FORMAT_D16_UNORM] = { .format = D16_UNORM }, - // [VK_FORMAT_D24_UNORM] = { .format = D24_UNORM }, - // [VK_FORMAT_D32_SFLOAT] = { .format = D32_SFLOAT }, - // [VK_FORMAT_S8_UINT] = { .format = S8_UINT }, - // [VK_FORMAT_D16_UNORM_S8_UINT] = { .format = D16_UNORM }, - // [VK_FORMAT_D24_UNORM_S8_UINT] = { .format = D24_UNORM }, - // [VK_FORMAT_D32_SFLOAT_S8_UINT] = { .format = D32_SFLOAT }, - // [VK_FORMAT_BC1_RGB_UNORM] = { .format = BC1_RGB }, - // [VK_FORMAT_BC1_RGB_SRGB] = { .format = BC1_RGB }, - // [VK_FORMAT_BC1_RGBA_UNORM] = { .format = BC1_RGBA }, - // [VK_FORMAT_BC1_RGBA_SRGB] = { .format = BC1_RGBA }, - // [VK_FORMAT_BC2_UNORM] = { .format = BC2_UNORM }, - // [VK_FORMAT_BC2_SRGB] = { .format = BC2_SRGB }, - // [VK_FORMAT_BC3_UNORM] = { .format = BC3_UNORM }, - // [VK_FORMAT_BC3_SRGB] = { .format = BC3_SRGB }, - // [VK_FORMAT_BC4_UNORM] = { .format = BC4_UNORM }, - // [VK_FORMAT_BC4_SNORM] = { .format = BC4_SNORM }, - // [VK_FORMAT_BC5_UNORM] = { .format = BC5_UNORM }, - // [VK_FORMAT_BC5_SNORM] = { .format = BC5_SNORM }, - // [VK_FORMAT_BC6H_UFLOAT] = { .format = BC6H_UFLOAT }, - // [VK_FORMAT_BC6H_SFLOAT] = { .format = BC6H_SFLOAT }, - // [VK_FORMAT_BC7_UNORM] = { .format = BC7_UNORM }, - // [VK_FORMAT_BC7_SRGB] = { .format = BC7_SRGB }, - // [VK_FORMAT_ETC2_R8G8B8_UNORM] = { .format = ETC2_R8G8B8 }, - // [VK_FORMAT_ETC2_R8G8B8_SRGB] = { .format = ETC2_R8G8B8 }, - // [VK_FORMAT_ETC2_R8G8B8A1_UNORM] = { .format = ETC2_R8G8B8A1 }, - // [VK_FORMAT_ETC2_R8G8B8A1_SRGB] = { .format = ETC2_R8G8B8A1 }, - // [VK_FORMAT_ETC2_R8G8B8A8_UNORM] = { .format = ETC2_R8G8B8A8 }, - // [VK_FORMAT_ETC2_R8G8B8A8_SRGB] = { .format = ETC2_R8G8B8A8 }, - // [VK_FORMAT_EAC_R11_UNORM] = { .format = EAC_R11 }, - // [VK_FORMAT_EAC_R11_SNORM] = { .format = EAC_R11 }, - // [VK_FORMAT_EAC_R11G11_UNORM] = { .format = EAC_R11G11 }, - // [VK_FORMAT_EAC_R11G11_SNORM] = { .format = EAC_R11G11 }, - // [VK_FORMAT_ASTC_4x4_UNORM] = { .format = ASTC_4x4 }, - // [VK_FORMAT_ASTC_4x4_SRGB] = { .format = ASTC_4x4 }, - // [VK_FORMAT_ASTC_5x4_UNORM] = { .format = ASTC_5x4 }, - // [VK_FORMAT_ASTC_5x4_SRGB] = { .format = ASTC_5x4 }, - // [VK_FORMAT_ASTC_5x5_UNORM] = { .format = ASTC_5x5 }, - // [VK_FORMAT_ASTC_5x5_SRGB] = { .format = ASTC_5x5 }, - // [VK_FORMAT_ASTC_6x5_UNORM] = { .format = ASTC_6x5 }, - // [VK_FORMAT_ASTC_6x5_SRGB] = { .format = ASTC_6x5 }, - // [VK_FORMAT_ASTC_6x6_UNORM] = { .format = ASTC_6x6 }, - // [VK_FORMAT_ASTC_6x6_SRGB] = { .format = ASTC_6x6 }, - // [VK_FORMAT_ASTC_8x5_UNORM] = { .format = ASTC_8x5 }, - // [VK_FORMAT_ASTC_8x5_SRGB] = { .format = ASTC_8x5 }, - // [VK_FORMAT_ASTC_8x6_UNORM] = { .format = ASTC_8x6 }, - // [VK_FORMAT_ASTC_8x6_SRGB] = { .format = ASTC_8x6 }, - // [VK_FORMAT_ASTC_8x8_UNORM] = { .format = ASTC_8x8 }, - // [VK_FORMAT_ASTC_8x8_SRGB] = { .format = ASTC_8x8 }, - // [VK_FORMAT_ASTC_10x5_UNORM] = { .format = ASTC_10x5 }, - // [VK_FORMAT_ASTC_10x5_SRGB] = { .format = ASTC_10x5 }, - // [VK_FORMAT_ASTC_10x6_UNORM] = { .format = ASTC_10x6 }, - // [VK_FORMAT_ASTC_10x6_SRGB] = { .format = ASTC_10x6 }, - // [VK_FORMAT_ASTC_10x8_UNORM] = { .format = ASTC_10x8 }, - // [VK_FORMAT_ASTC_10x8_SRGB] = { .format = ASTC_10x8 }, - // [VK_FORMAT_ASTC_10x10_UNORM] = { .format = ASTC_10x10 }, - // [VK_FORMAT_ASTC_10x10_SRGB] = { .format = ASTC_10x10 }, - // [VK_FORMAT_ASTC_12x10_UNORM] = { .format = ASTC_12x10 }, - // [VK_FORMAT_ASTC_12x10_SRGB] = { .format = ASTC_12x10 }, - // [VK_FORMAT_ASTC_12x12_UNORM] = { .format = ASTC_12x12 }, - // [VK_FORMAT_ASTC_12x12_SRGB] = { .format = ASTC_12x12 }, + + [VK_FORMAT_D16_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_D24_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_D32_SFLOAT] = { .format = UNSUPPORTED }, + [VK_FORMAT_S8_UINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_D16_UNORM_S8_UINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_D24_UNORM_S8_UINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_D32_SFLOAT_S8_UINT] = { .format = UNSUPPORTED }, + + [VK_FORMAT_BC1_RGB_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC1_RGB_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC1_RGBA_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC1_RGBA_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC2_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC2_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC3_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC3_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC4_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC4_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC5_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC5_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC6H_UFLOAT] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC6H_SFLOAT] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC7_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_BC7_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8A1_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8A1_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8A8_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ETC2_R8G8B8A8_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_EAC_R11_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_EAC_R11_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_EAC_R11G11_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_EAC_R11G11_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_4x4_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_4x4_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_5x4_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_5x4_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_5x5_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_5x5_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_6x5_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_6x5_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_6x6_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_6x6_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x5_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x5_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x6_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x6_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x8_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_8x8_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x5_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x5_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x6_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x6_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x8_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x8_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x10_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_10x10_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_12x10_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_12x10_SRGB] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_12x12_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_ASTC_12x12_SRGB] = { .format = UNSUPPORTED }, [VK_FORMAT_B4G4R4A4_UNORM] = { .format = B4G4R4A4_UNORM, .cpp = 2, .channels = 4 }, [VK_FORMAT_B5G5R5A1_UNORM] = { .format = B5G5R5A1_UNORM, .cpp = 2, .channels = 4 }, [VK_FORMAT_B5G6R5_UNORM] = { .format = B5G6R5_UNORM, .cpp = 2, .channels = 3 }, - // [VK_FORMAT_B5G6R5_USCALED] = { .format = B5G6R5_USCALED }, - // [VK_FORMAT_B8G8R8_UNORM] = { .format = B8G8R8_UNORM }, - // [VK_FORMAT_B8G8R8_SNORM] = { .format = B8G8R8_SNORM }, - // [VK_FORMAT_B8G8R8_USCALED] = { .format = B8G8R8_USCALED }, - // [VK_FORMAT_B8G8R8_SSCALED] = { .format = B8G8R8_SSCALED }, - // [VK_FORMAT_B8G8R8_UINT] = { .format = B8G8R8_UINT }, - // [VK_FORMAT_B8G8R8_SINT] = { .format = B8G8R8_SINT }, - // [VK_FORMAT_B8G8R8_SRGB] = { .format = B8G8R8_SRGB }, + [VK_FORMAT_B5G6R5_USCALED] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_UNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_USCALED] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_SSCALED] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_UINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_SINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8_SRGB] = { .format = UNSUPPORTED }, [VK_FORMAT_B8G8R8A8_UNORM] = { .format = B8G8R8A8_UNORM, .cpp = 4, .channels = 4 }, - // [VK_FORMAT_B8G8R8A8_SNORM] = { .format = B8G8R8A8_SNORM }, - // [VK_FORMAT_B8G8R8A8_USCALED] = { .format = B8G8R8A8_USCALED }, - // [VK_FORMAT_B8G8R8A8_SSCALED] = { .format = B8G8R8A8_SSCALED }, - // [VK_FORMAT_B8G8R8A8_UINT] = { .format = B8G8R8A8_UINT }, - // [VK_FORMAT_B8G8R8A8_SINT] = { .format = B8G8R8A8_SINT }, - // [VK_FORMAT_B8G8R8A8_SRGB] = { .format = B8G8R8A8_SRGB }, + [VK_FORMAT_B8G8R8A8_SNORM] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8A8_USCALED] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8A8_SSCALED] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8A8_UINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8A8_SINT] = { .format = UNSUPPORTED }, + [VK_FORMAT_B8G8R8A8_SRGB] = { .format = B8G8R8A8_UNORM_SRGB, .cpp = 4, .channels = 4 }, [VK_FORMAT_B10G10R10A2_UNORM] = { .format = B10G10R10A2_UNORM, .cpp = 4, .channels = 4 }, [VK_FORMAT_B10G10R10A2_SNORM] = { .format = B10G10R10A2_SNORM, .cpp = 4, .channels = 4 }, [VK_FORMAT_B10G10R10A2_USCALED] = { .format = B10G10R10A2_USCALED, .cpp = 4, .channels = 4 }, -- 2.30.2