diff options
author | Kristian Høgsberg <[email protected]> | 2015-05-17 21:35:34 -0700 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2015-05-18 10:27:07 -0700 |
commit | 60ebcbed544f022325469373f1b4b7114bfa5ea7 (patch) | |
tree | 2114551707037fc7aa60c9a02f0ddfc68a9fbe46 /src/vulkan/image.c | |
parent | 454345da1e8d22f3612aa3fec6b1cf3027845d48 (diff) |
vk: Start Implementing vkGetFormatInfo()
We move the format table and vkGetFormatInfo to their own file in the
process.
Diffstat (limited to 'src/vulkan/image.c')
-rw-r--r-- | src/vulkan/image.c | 183 |
1 files changed, 0 insertions, 183 deletions
diff --git a/src/vulkan/image.c b/src/vulkan/image.c index 812fba88b9f..d5e74dc6594 100644 --- a/src/vulkan/image.c +++ b/src/vulkan/image.c @@ -31,189 +31,6 @@ // Image functions -static const struct anv_format anv_formats[] = { - [VK_FORMAT_UNDEFINED] = { .format = RAW }, - // [VK_FORMAT_R4G4_UNORM] = { .format = R4G4_UNORM }, - // [VK_FORMAT_R4G4_USCALED] = { .format = R4G4_USCALED }, - // [VK_FORMAT_R4G4B4A4_UNORM] = { .format = R4G4B4A4_UNORM }, - // [VK_FORMAT_R4G4B4A4_USCALED] = { .format = R4G4B4A4_USCALED }, - // [VK_FORMAT_R5G6B5_UNORM] = { .format = R5G6B5_UNORM }, - // [VK_FORMAT_R5G6B5_USCALED] = { .format = R5G6B5_USCALED }, - // [VK_FORMAT_R5G5B5A1_UNORM] = { .format = R5G5B5A1_UNORM }, - // [VK_FORMAT_R5G5B5A1_USCALED] = { .format = R5G5B5A1_USCALED }, - [VK_FORMAT_R8_UNORM] = { .format = R8_UNORM, .cpp = 1, .channels = 1 }, - [VK_FORMAT_R8_SNORM] = { .format = R8_SNORM, .cpp = 1, .channels = 1 }, - [VK_FORMAT_R8_USCALED] = { .format = R8_USCALED, .cpp = 1, .channels = 1 }, - [VK_FORMAT_R8_SSCALED] = { .format = R8_SSCALED, .cpp = 1, .channels = 1 }, - [VK_FORMAT_R8_UINT] = { .format = R8_UINT, .cpp = 1, .channels = 1 }, - [VK_FORMAT_R8_SINT] = { .format = R8_SINT, .cpp = 1, .channels = 1 }, - // [VK_FORMAT_R8_SRGB] = { .format = R8_SRGB, .cpp = 1 }, - [VK_FORMAT_R8G8_UNORM] = { .format = R8G8_UNORM, .cpp = 2, .channels = 2 }, - [VK_FORMAT_R8G8_SNORM] = { .format = R8G8_SNORM, .cpp = 2, .channels = 2 }, - [VK_FORMAT_R8G8_USCALED] = { .format = R8G8_USCALED, .cpp = 2, .channels = 2 }, - [VK_FORMAT_R8G8_SSCALED] = { .format = R8G8_SSCALED, .cpp = 2, .channels = 2 }, - [VK_FORMAT_R8G8_UINT] = { .format = R8G8_UINT, .cpp = 2, .channels = 2 }, - [VK_FORMAT_R8G8_SINT] = { .format = R8G8_SINT, .cpp = 2, .channels = 2 }, - // [VK_FORMAT_R8G8_SRGB] = { .format = R8G8_SRGB }, - [VK_FORMAT_R8G8B8_UNORM] = { .format = R8G8B8X8_UNORM, .cpp = 3, .channels = 3 }, - // [VK_FORMAT_R8G8B8_SNORM] = { .format = R8G8B8X8_SNORM, .cpp = 4 }, - [VK_FORMAT_R8G8B8_USCALED] = { .format = R8G8B8_USCALED, .cpp = 3, .channels = 3 }, - [VK_FORMAT_R8G8B8_SSCALED] = { .format = R8G8B8_SSCALED, .cpp = 3, .channels = 3 }, - [VK_FORMAT_R8G8B8_UINT] = { .format = R8G8B8_UINT, .cpp = 3, .channels = 3 }, - [VK_FORMAT_R8G8B8_SINT] = { .format = R8G8B8_SINT, .cpp = 3, .channels = 3 }, - // [VK_FORMAT_R8G8B8_SRGB] = { .format = R8G8B8_SRGB }, - [VK_FORMAT_R8G8B8A8_UNORM] = { .format = R8G8B8A8_UNORM, .cpp = 4, .channels = 4 }, - [VK_FORMAT_R8G8B8A8_SNORM] = { .format = R8G8B8A8_SNORM, .cpp = 4, .channels = 4 }, - [VK_FORMAT_R8G8B8A8_USCALED] = { .format = R8G8B8A8_USCALED, .cpp = 4, .channels = 4 }, - [VK_FORMAT_R8G8B8A8_SSCALED] = { .format = R8G8B8A8_SSCALED, .cpp = 4, .channels = 4 }, - [VK_FORMAT_R8G8B8A8_UINT] = { .format = R8G8B8A8_UINT, .cpp = 4, .channels = 4 }, - [VK_FORMAT_R8G8B8A8_SINT] = { .format = R8G8B8A8_SINT, .cpp = 4, .channels = 4 }, - // [VK_FORMAT_R8G8B8A8_SRGB] = { .format = R8G8B8A8_SRGB }, - // [VK_FORMAT_R10G10B10A2_UNORM] = { .format = R10G10B10A2_UNORM }, - // [VK_FORMAT_R10G10B10A2_SNORM] = { .format = R10G10B10A2_SNORM }, - // [VK_FORMAT_R10G10B10A2_USCALED] = { .format = R10G10B10A2_USCALED }, - // [VK_FORMAT_R10G10B10A2_SSCALED] = { .format = R10G10B10A2_SSCALED }, - // [VK_FORMAT_R10G10B10A2_UINT] = { .format = R10G10B10A2_UINT }, - // [VK_FORMAT_R10G10B10A2_SINT] = { .format = R10G10B10A2_SINT }, - // [VK_FORMAT_R16_UNORM] = { .format = R16_UNORM }, - // [VK_FORMAT_R16_SNORM] = { .format = R16_SNORM }, - // [VK_FORMAT_R16_USCALED] = { .format = R16_USCALED }, - // [VK_FORMAT_R16_SSCALED] = { .format = R16_SSCALED }, - // [VK_FORMAT_R16_UINT] = { .format = R16_UINT }, - // [VK_FORMAT_R16_SINT] = { .format = R16_SINT }, - [VK_FORMAT_R16_SFLOAT] = { .format = R16_FLOAT, .cpp = 2, .channels = 1 }, - // [VK_FORMAT_R16G16_UNORM] = { .format = R16G16_UNORM }, - // [VK_FORMAT_R16G16_SNORM] = { .format = R16G16_SNORM }, - // [VK_FORMAT_R16G16_USCALED] = { .format = R16G16_USCALED }, - // [VK_FORMAT_R16G16_SSCALED] = { .format = R16G16_SSCALED }, - // [VK_FORMAT_R16G16_UINT] = { .format = R16G16_UINT }, - // [VK_FORMAT_R16G16_SINT] = { .format = R16G16_SINT }, - [VK_FORMAT_R16G16_SFLOAT] = { .format = R16G16_FLOAT, .cpp = 4, .channels = 2 }, - // [VK_FORMAT_R16G16B16_UNORM] = { .format = R16G16B16_UNORM }, - // [VK_FORMAT_R16G16B16_SNORM] = { .format = R16G16B16_SNORM }, - // [VK_FORMAT_R16G16B16_USCALED] = { .format = R16G16B16_USCALED }, - // [VK_FORMAT_R16G16B16_SSCALED] = { .format = R16G16B16_SSCALED }, - // [VK_FORMAT_R16G16B16_UINT] = { .format = R16G16B16_UINT }, - // [VK_FORMAT_R16G16B16_SINT] = { .format = R16G16B16_SINT }, - [VK_FORMAT_R16G16B16_SFLOAT] = { .format = R16G16B16_FLOAT, .cpp = 6, .channels = 3 }, - // [VK_FORMAT_R16G16B16A16_UNORM] = { .format = R16G16B16A16_UNORM }, - // [VK_FORMAT_R16G16B16A16_SNORM] = { .format = R16G16B16A16_SNORM }, - // [VK_FORMAT_R16G16B16A16_USCALED] = { .format = R16G16B16A16_USCALED }, - // [VK_FORMAT_R16G16B16A16_SSCALED] = { .format = R16G16B16A16_SSCALED }, - // [VK_FORMAT_R16G16B16A16_UINT] = { .format = R16G16B16A16_UINT }, - // [VK_FORMAT_R16G16B16A16_SINT] = { .format = R16G16B16A16_SINT }, - [VK_FORMAT_R16G16B16A16_SFLOAT] = { .format = R16G16B16A16_FLOAT, .cpp = 8, .channels = 4 }, - [VK_FORMAT_R32_UINT] = { .format = R32_UINT, .cpp = 4, .channels = 1 }, - [VK_FORMAT_R32_SINT] = { .format = R32_SINT, .cpp = 4, .channels = 1 }, - [VK_FORMAT_R32_SFLOAT] = { .format = R32_FLOAT, .cpp = 4, .channels = 1 }, - [VK_FORMAT_R32G32_UINT] = { .format = R32G32_UINT, .cpp = 8, .channels = 2 }, - [VK_FORMAT_R32G32_SINT] = { .format = R32G32_SINT, .cpp = 8, .channels = 2 }, - [VK_FORMAT_R32G32_SFLOAT] = { .format = R32G32_FLOAT, .cpp = 8, .channels = 2 }, - [VK_FORMAT_R32G32B32_UINT] = { .format = R32G32B32_UINT, .cpp = 12, .channels = 3 }, - [VK_FORMAT_R32G32B32_SINT] = { .format = R32G32B32_SINT, .cpp = 12, .channels = 3 }, - [VK_FORMAT_R32G32B32_SFLOAT] = { .format = R32G32B32_FLOAT, .cpp = 12, .channels = 3 }, - [VK_FORMAT_R32G32B32A32_UINT] = { .format = R32G32B32A32_UINT, .cpp = 16, .channels = 4 }, - [VK_FORMAT_R32G32B32A32_SINT] = { .format = R32G32B32A32_SINT, .cpp = 16, .channels = 4 }, - [VK_FORMAT_R32G32B32A32_SFLOAT] = { .format = R32G32B32A32_FLOAT, .cpp = 16, .channels = 4 }, - [VK_FORMAT_R64_SFLOAT] = { .format = R64_FLOAT, .cpp = 8, .channels = 1 }, - [VK_FORMAT_R64G64_SFLOAT] = { .format = R64G64_FLOAT, .cpp = 16, .channels = 2 }, - [VK_FORMAT_R64G64B64_SFLOAT] = { .format = R64G64B64_FLOAT, .cpp = 24, .channels = 3 }, - [VK_FORMAT_R64G64B64A64_SFLOAT] = { .format = R64G64B64A64_FLOAT, .cpp = 32, .channels = 4 }, - // [VK_FORMAT_R11G11B10_UFLOAT] = { .format = R11G11B10_UFLOAT }, - // [VK_FORMAT_R9G9B9E5_UFLOAT] = { .format = R9G9B9E5_UFLOAT }, - // [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_B4G4R4A4_UNORM] = { .format = B4G4R4A4_UNORM }, - // [VK_FORMAT_B5G5R5A1_UNORM] = { .format = B5G5R5A1_UNORM }, - // [VK_FORMAT_B5G6R5_UNORM] = { .format = B5G6R5_UNORM }, - // [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_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_B10G10R10A2_UNORM] = { .format = B10G10R10A2_UNORM }, - // [VK_FORMAT_B10G10R10A2_SNORM] = { .format = B10G10R10A2_SNORM }, - // [VK_FORMAT_B10G10R10A2_USCALED] = { .format = B10G10R10A2_USCALED }, - // [VK_FORMAT_B10G10R10A2_SSCALED] = { .format = B10G10R10A2_SSCALED }, - // [VK_FORMAT_B10G10R10A2_UINT] = { .format = B10G10R10A2_UINT }, - // [VK_FORMAT_B10G10R10A2_SINT] = { .format = B10G10R10A2_SINT } -}; - -const struct anv_format * -anv_format_for_vk_format(VkFormat format) -{ - return &anv_formats[format]; -} - static const struct anv_tile_mode_info { int32_t tile_width; int32_t tile_height; |