From 4b8b451a1dc6bd67704813ae885e2e8c351647b0 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Thu, 25 Jun 2015 18:01:08 -0700 Subject: [PATCH] vk/formats: Rename anv_format::channels -> num_channels I misinterpreted anv_format::channels as a bitmask of channels. Renaming it to 'num_channels' makes it unambiguous. --- src/vulkan/formats.c | 190 +++++++++++++++++++++--------------------- src/vulkan/pipeline.c | 6 +- src/vulkan/private.h | 2 +- 3 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/vulkan/formats.c b/src/vulkan/formats.c index 2fc85c81487..d0ee51360dd 100644 --- a/src/vulkan/formats.c +++ b/src/vulkan/formats.c @@ -29,7 +29,7 @@ [__vk_fmt] = { .name = #__vk_fmt, __VA_ARGS__ } static const struct anv_format anv_formats[] = { - fmt(VK_FORMAT_UNDEFINED, .format = RAW, .cpp = 1, .channels = 1), + fmt(VK_FORMAT_UNDEFINED, .format = RAW, .cpp = 1, .num_channels = 1), fmt(VK_FORMAT_R4G4_UNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_R4G4_USCALED, .format = UNSUPPORTED), fmt(VK_FORMAT_R4G4B4A4_UNORM, .format = UNSUPPORTED), @@ -38,98 +38,98 @@ static const struct anv_format anv_formats[] = { fmt(VK_FORMAT_R5G6B5_USCALED, .format = UNSUPPORTED), fmt(VK_FORMAT_R5G5B5A1_UNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_R5G5B5A1_USCALED, .format = UNSUPPORTED), - fmt(VK_FORMAT_R8_UNORM, .format = R8_UNORM, .cpp = 1, .channels = 1), - fmt(VK_FORMAT_R8_SNORM, .format = R8_SNORM, .cpp = 1, .channels = 1,), - fmt(VK_FORMAT_R8_USCALED, .format = R8_USCALED, .cpp = 1, .channels = 1), - fmt(VK_FORMAT_R8_SSCALED, .format = R8_SSCALED, .cpp = 1, .channels = 1), - fmt(VK_FORMAT_R8_UINT, .format = R8_UINT, .cpp = 1, .channels = 1), - fmt(VK_FORMAT_R8_SINT, .format = R8_SINT, .cpp = 1, .channels = 1), + fmt(VK_FORMAT_R8_UNORM, .format = R8_UNORM, .cpp = 1, .num_channels = 1), + fmt(VK_FORMAT_R8_SNORM, .format = R8_SNORM, .cpp = 1, .num_channels = 1,), + fmt(VK_FORMAT_R8_USCALED, .format = R8_USCALED, .cpp = 1, .num_channels = 1), + fmt(VK_FORMAT_R8_SSCALED, .format = R8_SSCALED, .cpp = 1, .num_channels = 1), + fmt(VK_FORMAT_R8_UINT, .format = R8_UINT, .cpp = 1, .num_channels = 1), + fmt(VK_FORMAT_R8_SINT, .format = R8_SINT, .cpp = 1, .num_channels = 1), fmt(VK_FORMAT_R8_SRGB, .format = UNSUPPORTED), - fmt(VK_FORMAT_R8G8_UNORM, .format = R8G8_UNORM, .cpp = 2, .channels = 2), - fmt(VK_FORMAT_R8G8_SNORM, .format = R8G8_SNORM, .cpp = 2, .channels = 2), - fmt(VK_FORMAT_R8G8_USCALED, .format = R8G8_USCALED, .cpp = 2, .channels = 2), - fmt(VK_FORMAT_R8G8_SSCALED, .format = R8G8_SSCALED, .cpp = 2, .channels = 2), - fmt(VK_FORMAT_R8G8_UINT, .format = R8G8_UINT, .cpp = 2, .channels = 2), - fmt(VK_FORMAT_R8G8_SINT, .format = R8G8_SINT, .cpp = 2, .channels = 2), + fmt(VK_FORMAT_R8G8_UNORM, .format = R8G8_UNORM, .cpp = 2, .num_channels = 2), + fmt(VK_FORMAT_R8G8_SNORM, .format = R8G8_SNORM, .cpp = 2, .num_channels = 2), + fmt(VK_FORMAT_R8G8_USCALED, .format = R8G8_USCALED, .cpp = 2, .num_channels = 2), + fmt(VK_FORMAT_R8G8_SSCALED, .format = R8G8_SSCALED, .cpp = 2, .num_channels = 2), + fmt(VK_FORMAT_R8G8_UINT, .format = R8G8_UINT, .cpp = 2, .num_channels = 2), + fmt(VK_FORMAT_R8G8_SINT, .format = R8G8_SINT, .cpp = 2, .num_channels = 2), fmt(VK_FORMAT_R8G8_SRGB, .format = UNSUPPORTED), /* L8A8_UNORM_SRGB */ - fmt(VK_FORMAT_R8G8B8_UNORM, .format = R8G8B8X8_UNORM, .cpp = 3, .channels = 3), + fmt(VK_FORMAT_R8G8B8_UNORM, .format = R8G8B8X8_UNORM, .cpp = 3, .num_channels = 3), fmt(VK_FORMAT_R8G8B8_SNORM, .format = R8G8B8_SNORM, .cpp = 4), - fmt(VK_FORMAT_R8G8B8_USCALED, .format = R8G8B8_USCALED, .cpp = 3, .channels = 3), - fmt(VK_FORMAT_R8G8B8_SSCALED, .format = R8G8B8_SSCALED, .cpp = 3, .channels = 3), - fmt(VK_FORMAT_R8G8B8_UINT, .format = R8G8B8_UINT, .cpp = 3, .channels = 3), - fmt(VK_FORMAT_R8G8B8_SINT, .format = R8G8B8_SINT, .cpp = 3, .channels = 3), + fmt(VK_FORMAT_R8G8B8_USCALED, .format = R8G8B8_USCALED, .cpp = 3, .num_channels = 3), + fmt(VK_FORMAT_R8G8B8_SSCALED, .format = R8G8B8_SSCALED, .cpp = 3, .num_channels = 3), + fmt(VK_FORMAT_R8G8B8_UINT, .format = R8G8B8_UINT, .cpp = 3, .num_channels = 3), + fmt(VK_FORMAT_R8G8B8_SINT, .format = R8G8B8_SINT, .cpp = 3, .num_channels = 3), fmt(VK_FORMAT_R8G8B8_SRGB, .format = UNSUPPORTED), /* B8G8R8A8_UNORM_SRGB */ - fmt(VK_FORMAT_R8G8B8A8_UNORM, .format = R8G8B8A8_UNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_SNORM, .format = R8G8B8A8_SNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_USCALED, .format = R8G8B8A8_USCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_SSCALED, .format = R8G8B8A8_SSCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_UINT, .format = R8G8B8A8_UINT, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_SINT, .format = R8G8B8A8_SINT, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R8G8B8A8_SRGB, .format = R8G8B8A8_UNORM_SRGB, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_UNORM, .format = R10G10B10A2_UNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_SNORM, .format = R10G10B10A2_SNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_USCALED, .format = R10G10B10A2_USCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_SSCALED, .format = R10G10B10A2_SSCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_UINT, .format = R10G10B10A2_UINT, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R10G10B10A2_SINT, .format = R10G10B10A2_SINT, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_R16_UNORM, .format = R16_UNORM, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_SNORM, .format = R16_SNORM, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_USCALED, .format = R16_USCALED, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_SSCALED, .format = R16_SSCALED, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_UINT, .format = R16_UINT, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_SINT, .format = R16_SINT, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16_SFLOAT, .format = R16_FLOAT, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_R16G16_UNORM, .format = R16G16_UNORM, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_SNORM, .format = R16G16_SNORM, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_USCALED, .format = R16G16_USCALED, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_SSCALED, .format = R16G16_SSCALED, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_UINT, .format = R16G16_UINT, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_SINT, .format = R16G16_SINT, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16_SFLOAT, .format = R16G16_FLOAT, .cpp = 4, .channels = 2), - fmt(VK_FORMAT_R16G16B16_UNORM, .format = R16G16B16_UNORM, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_SNORM, .format = R16G16B16_SNORM, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_USCALED, .format = R16G16B16_USCALED, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_SSCALED, .format = R16G16B16_SSCALED, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_UINT, .format = R16G16B16_UINT, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_SINT, .format = R16G16B16_SINT, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16_SFLOAT, .format = R16G16B16_FLOAT, .cpp = 6, .channels = 3), - fmt(VK_FORMAT_R16G16B16A16_UNORM, .format = R16G16B16A16_UNORM, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_SNORM, .format = R16G16B16A16_SNORM, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_USCALED, .format = R16G16B16A16_USCALED, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_SSCALED, .format = R16G16B16A16_SSCALED, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_UINT, .format = R16G16B16A16_UINT, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_SINT, .format = R16G16B16A16_SINT, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R16G16B16A16_SFLOAT, .format = R16G16B16A16_FLOAT, .cpp = 8, .channels = 4), - fmt(VK_FORMAT_R32_UINT, .format = R32_UINT, .cpp = 4, .channels = 1,), - fmt(VK_FORMAT_R32_SINT, .format = R32_SINT, .cpp = 4, .channels = 1,), - fmt(VK_FORMAT_R32_SFLOAT, .format = R32_FLOAT, .cpp = 4, .channels = 1,), - fmt(VK_FORMAT_R32G32_UINT, .format = R32G32_UINT, .cpp = 8, .channels = 2,), - fmt(VK_FORMAT_R32G32_SINT, .format = R32G32_SINT, .cpp = 8, .channels = 2,), - fmt(VK_FORMAT_R32G32_SFLOAT, .format = R32G32_FLOAT, .cpp = 8, .channels = 2,), - fmt(VK_FORMAT_R32G32B32_UINT, .format = R32G32B32_UINT, .cpp = 12, .channels = 3,), - fmt(VK_FORMAT_R32G32B32_SINT, .format = R32G32B32_SINT, .cpp = 12, .channels = 3,), - fmt(VK_FORMAT_R32G32B32_SFLOAT, .format = R32G32B32_FLOAT, .cpp = 12, .channels = 3,), - fmt(VK_FORMAT_R32G32B32A32_UINT, .format = R32G32B32A32_UINT, .cpp = 16, .channels = 4,), - fmt(VK_FORMAT_R32G32B32A32_SINT, .format = R32G32B32A32_SINT, .cpp = 16, .channels = 4,), - fmt(VK_FORMAT_R32G32B32A32_SFLOAT, .format = R32G32B32A32_FLOAT, .cpp = 16, .channels = 4,), - fmt(VK_FORMAT_R64_SFLOAT, .format = R64_FLOAT, .cpp = 8, .channels = 1), - fmt(VK_FORMAT_R64G64_SFLOAT, .format = R64G64_FLOAT, .cpp = 16, .channels = 2), - fmt(VK_FORMAT_R64G64B64_SFLOAT, .format = R64G64B64_FLOAT, .cpp = 24, .channels = 3), - fmt(VK_FORMAT_R64G64B64A64_SFLOAT, .format = R64G64B64A64_FLOAT, .cpp = 32, .channels = 4), - fmt(VK_FORMAT_R11G11B10_UFLOAT, .format = R11G11B10_FLOAT, .cpp = 4, .channels = 3), - fmt(VK_FORMAT_R9G9B9E5_UFLOAT, .format = R9G9B9E5_SHAREDEXP, .cpp = 4, .channels = 3), + fmt(VK_FORMAT_R8G8B8A8_UNORM, .format = R8G8B8A8_UNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_SNORM, .format = R8G8B8A8_SNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_USCALED, .format = R8G8B8A8_USCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_SSCALED, .format = R8G8B8A8_SSCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_UINT, .format = R8G8B8A8_UINT, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_SINT, .format = R8G8B8A8_SINT, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R8G8B8A8_SRGB, .format = R8G8B8A8_UNORM_SRGB, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_UNORM, .format = R10G10B10A2_UNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_SNORM, .format = R10G10B10A2_SNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_USCALED, .format = R10G10B10A2_USCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_SSCALED, .format = R10G10B10A2_SSCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_UINT, .format = R10G10B10A2_UINT, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R10G10B10A2_SINT, .format = R10G10B10A2_SINT, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_R16_UNORM, .format = R16_UNORM, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_SNORM, .format = R16_SNORM, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_USCALED, .format = R16_USCALED, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_SSCALED, .format = R16_SSCALED, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_UINT, .format = R16_UINT, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_SINT, .format = R16_SINT, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16_SFLOAT, .format = R16_FLOAT, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_R16G16_UNORM, .format = R16G16_UNORM, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_SNORM, .format = R16G16_SNORM, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_USCALED, .format = R16G16_USCALED, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_SSCALED, .format = R16G16_SSCALED, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_UINT, .format = R16G16_UINT, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_SINT, .format = R16G16_SINT, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16_SFLOAT, .format = R16G16_FLOAT, .cpp = 4, .num_channels = 2), + fmt(VK_FORMAT_R16G16B16_UNORM, .format = R16G16B16_UNORM, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_SNORM, .format = R16G16B16_SNORM, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_USCALED, .format = R16G16B16_USCALED, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_SSCALED, .format = R16G16B16_SSCALED, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_UINT, .format = R16G16B16_UINT, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_SINT, .format = R16G16B16_SINT, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16_SFLOAT, .format = R16G16B16_FLOAT, .cpp = 6, .num_channels = 3), + fmt(VK_FORMAT_R16G16B16A16_UNORM, .format = R16G16B16A16_UNORM, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_SNORM, .format = R16G16B16A16_SNORM, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_USCALED, .format = R16G16B16A16_USCALED, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_SSCALED, .format = R16G16B16A16_SSCALED, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_UINT, .format = R16G16B16A16_UINT, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_SINT, .format = R16G16B16A16_SINT, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R16G16B16A16_SFLOAT, .format = R16G16B16A16_FLOAT, .cpp = 8, .num_channels = 4), + fmt(VK_FORMAT_R32_UINT, .format = R32_UINT, .cpp = 4, .num_channels = 1,), + fmt(VK_FORMAT_R32_SINT, .format = R32_SINT, .cpp = 4, .num_channels = 1,), + fmt(VK_FORMAT_R32_SFLOAT, .format = R32_FLOAT, .cpp = 4, .num_channels = 1,), + fmt(VK_FORMAT_R32G32_UINT, .format = R32G32_UINT, .cpp = 8, .num_channels = 2,), + fmt(VK_FORMAT_R32G32_SINT, .format = R32G32_SINT, .cpp = 8, .num_channels = 2,), + fmt(VK_FORMAT_R32G32_SFLOAT, .format = R32G32_FLOAT, .cpp = 8, .num_channels = 2,), + fmt(VK_FORMAT_R32G32B32_UINT, .format = R32G32B32_UINT, .cpp = 12, .num_channels = 3,), + fmt(VK_FORMAT_R32G32B32_SINT, .format = R32G32B32_SINT, .cpp = 12, .num_channels = 3,), + fmt(VK_FORMAT_R32G32B32_SFLOAT, .format = R32G32B32_FLOAT, .cpp = 12, .num_channels = 3,), + fmt(VK_FORMAT_R32G32B32A32_UINT, .format = R32G32B32A32_UINT, .cpp = 16, .num_channels = 4,), + fmt(VK_FORMAT_R32G32B32A32_SINT, .format = R32G32B32A32_SINT, .cpp = 16, .num_channels = 4,), + fmt(VK_FORMAT_R32G32B32A32_SFLOAT, .format = R32G32B32A32_FLOAT, .cpp = 16, .num_channels = 4,), + fmt(VK_FORMAT_R64_SFLOAT, .format = R64_FLOAT, .cpp = 8, .num_channels = 1), + fmt(VK_FORMAT_R64G64_SFLOAT, .format = R64G64_FLOAT, .cpp = 16, .num_channels = 2), + fmt(VK_FORMAT_R64G64B64_SFLOAT, .format = R64G64B64_FLOAT, .cpp = 24, .num_channels = 3), + fmt(VK_FORMAT_R64G64B64A64_SFLOAT, .format = R64G64B64A64_FLOAT, .cpp = 32, .num_channels = 4), + fmt(VK_FORMAT_R11G11B10_UFLOAT, .format = R11G11B10_FLOAT, .cpp = 4, .num_channels = 3), + fmt(VK_FORMAT_R9G9B9E5_UFLOAT, .format = R9G9B9E5_SHAREDEXP, .cpp = 4, .num_channels = 3), /* For depth/stencil formats, the .format and .cpp fields describe the * depth format. The field .has_stencil indicates whether or not there's a * stencil buffer. */ - fmt(VK_FORMAT_D16_UNORM, .format = D16_UNORM, .cpp = 2, .channels = 1), - fmt(VK_FORMAT_D24_UNORM, .format = D24_UNORM_X8_UINT, .cpp = 4, .channels = 1), - fmt(VK_FORMAT_D32_SFLOAT, .format = D32_FLOAT, .cpp = 4, .channels = 1), - fmt(VK_FORMAT_S8_UINT, .format = UNSUPPORTED, .cpp = 0, .channels = 1, .has_stencil = true), - fmt(VK_FORMAT_D16_UNORM_S8_UINT, .format = D16_UNORM, .cpp = 2, .channels = 2, .has_stencil = true), - fmt(VK_FORMAT_D24_UNORM_S8_UINT, .format = D24_UNORM_X8_UINT, .cpp = 4, .channels = 2, .has_stencil = true), - fmt(VK_FORMAT_D32_SFLOAT_S8_UINT, .format = D32_FLOAT, .cpp = 4, .channels = 2, .has_stencil = true), + fmt(VK_FORMAT_D16_UNORM, .format = D16_UNORM, .cpp = 2, .num_channels = 1), + fmt(VK_FORMAT_D24_UNORM, .format = D24_UNORM_X8_UINT, .cpp = 4, .num_channels = 1), + fmt(VK_FORMAT_D32_SFLOAT, .format = D32_FLOAT, .cpp = 4, .num_channels = 1), + fmt(VK_FORMAT_S8_UINT, .format = UNSUPPORTED, .cpp = 0, .num_channels = 1, .has_stencil = true), + fmt(VK_FORMAT_D16_UNORM_S8_UINT, .format = D16_UNORM, .cpp = 2, .num_channels = 2, .has_stencil = true), + fmt(VK_FORMAT_D24_UNORM_S8_UINT, .format = D24_UNORM_X8_UINT, .cpp = 4, .num_channels = 2, .has_stencil = true), + fmt(VK_FORMAT_D32_SFLOAT_S8_UINT, .format = D32_FLOAT, .cpp = 4, .num_channels = 2, .has_stencil = true), fmt(VK_FORMAT_BC1_RGB_UNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_BC1_RGB_SRGB, .format = UNSUPPORTED), @@ -185,9 +185,9 @@ static const struct anv_format anv_formats[] = { fmt(VK_FORMAT_ASTC_12x10_SRGB, .format = UNSUPPORTED), fmt(VK_FORMAT_ASTC_12x12_UNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_ASTC_12x12_SRGB, .format = UNSUPPORTED), - fmt(VK_FORMAT_B4G4R4A4_UNORM, .format = B4G4R4A4_UNORM, .cpp = 2, .channels = 4), - fmt(VK_FORMAT_B5G5R5A1_UNORM, .format = B5G5R5A1_UNORM, .cpp = 2, .channels = 4), - fmt(VK_FORMAT_B5G6R5_UNORM, .format = B5G6R5_UNORM, .cpp = 2, .channels = 3), + fmt(VK_FORMAT_B4G4R4A4_UNORM, .format = B4G4R4A4_UNORM, .cpp = 2, .num_channels = 4), + fmt(VK_FORMAT_B5G5R5A1_UNORM, .format = B5G5R5A1_UNORM, .cpp = 2, .num_channels = 4), + fmt(VK_FORMAT_B5G6R5_UNORM, .format = B5G6R5_UNORM, .cpp = 2, .num_channels = 3), fmt(VK_FORMAT_B5G6R5_USCALED, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8_UNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8_SNORM, .format = UNSUPPORTED), @@ -196,19 +196,19 @@ static const struct anv_format anv_formats[] = { fmt(VK_FORMAT_B8G8R8_UINT, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8_SINT, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8_SRGB, .format = UNSUPPORTED), - fmt(VK_FORMAT_B8G8R8A8_UNORM, .format = B8G8R8A8_UNORM, .cpp = 4, .channels = 4), + fmt(VK_FORMAT_B8G8R8A8_UNORM, .format = B8G8R8A8_UNORM, .cpp = 4, .num_channels = 4), fmt(VK_FORMAT_B8G8R8A8_SNORM, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8A8_USCALED, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8A8_SSCALED, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8A8_UINT, .format = UNSUPPORTED), fmt(VK_FORMAT_B8G8R8A8_SINT, .format = UNSUPPORTED), - fmt(VK_FORMAT_B8G8R8A8_SRGB, .format = B8G8R8A8_UNORM_SRGB, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_UNORM, .format = B10G10R10A2_UNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_SNORM, .format = B10G10R10A2_SNORM, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_USCALED, .format = B10G10R10A2_USCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_SSCALED, .format = B10G10R10A2_SSCALED, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_UINT, .format = B10G10R10A2_UINT, .cpp = 4, .channels = 4), - fmt(VK_FORMAT_B10G10R10A2_SINT, .format = B10G10R10A2_SINT, .cpp = 4, .channels = 4) + fmt(VK_FORMAT_B8G8R8A8_SRGB, .format = B8G8R8A8_UNORM_SRGB, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_UNORM, .format = B10G10R10A2_UNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_SNORM, .format = B10G10R10A2_SNORM, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_USCALED, .format = B10G10R10A2_USCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_SSCALED, .format = B10G10R10A2_SSCALED, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_UINT, .format = B10G10R10A2_UINT, .cpp = 4, .num_channels = 4), + fmt(VK_FORMAT_B10G10R10A2_SINT, .format = B10G10R10A2_SINT, .cpp = 4, .num_channels = 4) }; const struct anv_format * diff --git a/src/vulkan/pipeline.c b/src/vulkan/pipeline.c index 8be47c91205..ae57d5ea4a2 100644 --- a/src/vulkan/pipeline.c +++ b/src/vulkan/pipeline.c @@ -100,9 +100,9 @@ emit_vertex_input(struct anv_pipeline *pipeline, VkPipelineVertexInputCreateInfo .EdgeFlagEnable = false, .SourceElementOffset = desc->offsetInBytes, .Component0Control = VFCOMP_STORE_SRC, - .Component1Control = format->channels >= 2 ? VFCOMP_STORE_SRC : VFCOMP_STORE_0, - .Component2Control = format->channels >= 3 ? VFCOMP_STORE_SRC : VFCOMP_STORE_0, - .Component3Control = format->channels >= 4 ? VFCOMP_STORE_SRC : VFCOMP_STORE_1_FP + .Component1Control = format->num_channels >= 2 ? VFCOMP_STORE_SRC : VFCOMP_STORE_0, + .Component2Control = format->num_channels >= 3 ? VFCOMP_STORE_SRC : VFCOMP_STORE_0, + .Component3Control = format->num_channels >= 4 ? VFCOMP_STORE_SRC : VFCOMP_STORE_1_FP }; GEN8_VERTEX_ELEMENT_STATE_pack(NULL, &p[1 + i * 2], &element); diff --git a/src/vulkan/private.h b/src/vulkan/private.h index 620c5e468cc..0c0fe071704 100644 --- a/src/vulkan/private.h +++ b/src/vulkan/private.h @@ -775,7 +775,7 @@ struct anv_format { const char *name; uint16_t format; uint8_t cpp; - uint8_t channels; + uint8_t num_channels; bool has_stencil; }; -- 2.30.2